diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 17:10:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 17:10:19 -0700 |
| commit | c8d8170feb824875baf68f8aaecb181a6500ce81 (patch) | |
| tree | fc215c0776597015cd7e02ef12e24fe60e74961e /include/asm-xtensa/page.h | |
| parent | 34750bb15687fa03ba95a0ccb1307b0727bc308b (diff) | |
| parent | df5e38703d647b160d7ba300b3d2fcb64a48549a (diff) | |
Merge git://git.linux-xtensa.org/kernel/xtensa-feed
* git://git.linux-xtensa.org/kernel/xtensa-feed:
Xtensa: use asm-generic/fcntl.h
[XTENSA] Remove non-rt signal handling
[XTENSA] Move common sections into bss sections
[XTENSA] clean-up header files
[XTENSA] Use generic 64-bit division
[XTENSA] Remove multi-exported symbols from xtensa_ksyms.c
[XTENSA] fix sources using deprecated assembler directive
[XTENSA] Spelling fixes in arch/xtensa
[XTENSA] fix bit operations in bitops.h
Diffstat (limited to 'include/asm-xtensa/page.h')
| -rw-r--r-- | include/asm-xtensa/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h index c631d006194..1213cde7543 100644 --- a/include/asm-xtensa/page.h +++ b/include/asm-xtensa/page.h @@ -131,6 +131,6 @@ void copy_user_page(void *to,void* from,unsigned long vaddr,struct page* page); #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ #include <asm-generic/memory_model.h> +#endif /* __KERNEL__ */ #endif /* _XTENSA_PAGE_H */ |