diff options
| author | Richard Weinberger <richard@nod.at> | 2011-05-24 17:13:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 08:39:40 -0700 |
| commit | 0ce451acb1872eab0fcf22753f93f51567e812fa (patch) | |
| tree | cb9658d9faeec3fbb1d089c94da32f009bf9ff93 | |
| parent | 8aebe21e0f805b9c411a51e716bb34aa61c0cad6 (diff) | |
| download | linux-3.10-0ce451acb1872eab0fcf22753f93f51567e812fa.tar.gz linux-3.10-0ce451acb1872eab0fcf22753f93f51567e812fa.tar.bz2 linux-3.10-0ce451acb1872eab0fcf22753f93f51567e812fa.zip | |
um: fix UML_LIB_PATH
UML_LIB_PATH is hardcoded to /usr/lib/uml/, on 64bit systems UML_LIB_PATH
needs to be /usr/lib64/uml/.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/um/drivers/xterm.c | 2 | ||||
| -rw-r--r-- | arch/um/include/shared/os.h | 6 | ||||
| -rw-r--r-- | arch/um/os-Linux/main.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c index da2caa5a21e..8ac7146c237 100644 --- a/arch/um/drivers/xterm.c +++ b/arch/um/drivers/xterm.c @@ -90,7 +90,7 @@ static int xterm_open(int input, int output, int primary, void *d, int pid, fd, new, err; char title[256], file[] = "/tmp/xterm-pipeXXXXXX"; char *argv[] = { terminal_emulator, title_switch, title, exec_switch, - "/usr/lib/uml/port-helper", "-uml-socket", + OS_LIB_PATH "/uml/port-helper", "-uml-socket", file, NULL }; if (access(argv[4], X_OK) < 0) diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h index c4617baaa4f..f06a5da71a8 100644 --- a/arch/um/include/shared/os.h +++ b/arch/um/include/shared/os.h @@ -29,6 +29,12 @@ #define OS_ACC_R_OK 4 /* Test for read permission. */ #define OS_ACC_RW_OK (OS_ACC_W_OK | OS_ACC_R_OK) /* Test for RW permission */ +#ifdef CONFIG_64BIT +#define OS_LIB_PATH "/usr/lib64/" +#else +#define OS_LIB_PATH "/usr/lib/" +#endif + /* * types taken from stat_file() in hostfs_user.c * (if they are wrong here, they are wrong there...). diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index eee69b9f52c..39613ea4219 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c @@ -78,7 +78,7 @@ static void install_fatal_handler(int sig) } } -#define UML_LIB_PATH ":/usr/lib/uml" +#define UML_LIB_PATH ":" OS_LIB_PATH "/uml" static void setup_env_path(void) { |