diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-04 07:15:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-04 07:15:56 -0400 |
| commit | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (patch) | |
| tree | 193e53bc0fa0b01c3c0fab4d3eda23ce84bb1154 /include/asm-ia64/system.h | |
| parent | fe2a24dfc577a05349a39c6c8a6312818d28bb59 (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-ia64/system.h')
| -rw-r--r-- | include/asm-ia64/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h index fc9677bc87ee..384fbf7f2a0f 100644 --- a/include/asm-ia64/system.h +++ b/include/asm-ia64/system.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * 0xa000000000000000+2*PERCPU_PAGE_SIZE | 24 | * 0xa000000000000000+2*PERCPU_PAGE_SIZE |
| 25 | * - 0xa000000000000000+3*PERCPU_PAGE_SIZE remain unmapped (guard page) | 25 | * - 0xa000000000000000+3*PERCPU_PAGE_SIZE remain unmapped (guard page) |
| 26 | */ | 26 | */ |
| 27 | #define KERNEL_START (GATE_ADDR+0x100000000) | 27 | #define KERNEL_START (GATE_ADDR+__IA64_UL_CONST(0x100000000)) |
| 28 | #define PERCPU_ADDR (-PERCPU_PAGE_SIZE) | 28 | #define PERCPU_ADDR (-PERCPU_PAGE_SIZE) |
| 29 | 29 | ||
| 30 | #ifndef __ASSEMBLY__ | 30 | #ifndef __ASSEMBLY__ |