diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 09:45:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 09:45:08 -0700 |
| commit | 81ce31b773226332475f89501b1072bec0c0e241 (patch) | |
| tree | cd66f3c1caf731cc552ae90af2068aecabaed334 /arch/score/include/asm/shmbuf.h | |
| parent | 515b696b282f856c3ad1679ccd658120faa387d0 (diff) | |
| parent | 9973affe9bbcde64041890d8793eb2e74143c298 (diff) | |
Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score
* 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: (22 commits)
score: add TIF_NOTIFY_RESUME define in asm/thread_info.h
score: make init_thread_union align to THREAD_SIZE
score: update files according to review comments.
score: add old syscall support
score: add MEMORY_START and MEMORY_SIZE define, to make the code clear
score: update inconsistent declare after .c was changed
score: remove unused code, add include files in .c
score: clean up mm/init.c
score: make irq.h definitions local
score: cleanups: dead code, 0 as pointer, shadowed variables
score: fix function prototypes
score: add address space annotations
score: add missing #includes
score: move save arg5 and arg6 instruction in front of enable_irq
score: add prototypes for wrapped syscalls
score: remove init_mm
score: add generic sys_call_table
score: remove __{put,get}_user_unknown
score: unset __ARCH_WANT_IPC_PARSE_VERSION
score: update files according to review comments
...
Diffstat (limited to 'arch/score/include/asm/shmbuf.h')
| -rw-r--r-- | arch/score/include/asm/shmbuf.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/score/include/asm/shmbuf.h b/arch/score/include/asm/shmbuf.h new file mode 100644 index 000000000000..c85b2429ba21 --- /dev/null +++ b/arch/score/include/asm/shmbuf.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_SHMBUF_H +#define _ASM_SCORE_SHMBUF_H + +#include <asm-generic/shmbuf.h> + +#endif /* _ASM_SCORE_SHMBUF_H */ |