diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /include/asm-ppc | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/page.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h index 352faa4b0d4..0b19af82507 100644 --- a/include/asm-ppc/page.h +++ b/include/asm-ppc/page.h | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | /* This must match what is in arch/ppc/Makefile */ | 18 | /* This must match what is in arch/ppc/Makefile */ |
| 19 | #define PAGE_OFFSET CONFIG_KERNEL_START | 19 | #define PAGE_OFFSET CONFIG_KERNEL_START |
| 20 | #define KERNELBASE PAGE_OFFSET | 20 | #define KERNELBASE PAGE_OFFSET |
| 21 | #define is_kernel_addr(x) ((x) >= PAGE_OFFSET) | ||
| 21 | 22 | ||
| 22 | #ifndef __ASSEMBLY__ | 23 | #ifndef __ASSEMBLY__ |
| 23 | 24 | ||