diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/mips/kernel/setup.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/mips/kernel/setup.c')
| -rw-r--r-- | arch/mips/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 3a240e3e004c..12b531c295c4 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
| @@ -241,7 +241,7 @@ static inline int parse_rd_cmdline(unsigned long* rd_start, unsigned long* rd_en | |||
| 241 | if (*tmp) | 241 | if (*tmp) |
| 242 | strcat(command_line, tmp); | 242 | strcat(command_line, tmp); |
| 243 | 243 | ||
| 244 | #ifdef CONFIG_MIPS64 | 244 | #ifdef CONFIG_64BIT |
| 245 | /* HACK: Guess if the sign extension was forgotten */ | 245 | /* HACK: Guess if the sign extension was forgotten */ |
| 246 | if (start > 0x0000000080000000 && start < 0x00000000ffffffff) | 246 | if (start > 0x0000000080000000 && start < 0x00000000ffffffff) |
| 247 | start |= 0xffffffff00000000; | 247 | start |= 0xffffffff00000000; |
| @@ -446,7 +446,7 @@ static inline void resource_init(void) | |||
| 446 | { | 446 | { |
| 447 | int i; | 447 | int i; |
| 448 | 448 | ||
| 449 | #if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64) | 449 | #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) |
| 450 | /* | 450 | /* |
| 451 | * The 64bit code in 32bit object format trick can't represent | 451 | * The 64bit code in 32bit object format trick can't represent |
| 452 | * 64bit wide relocations for linker script symbols. | 452 | * 64bit wide relocations for linker script symbols. |