Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: convert page/tlb to asm-generic
  Blackfin: convert types to asm-generic
  Blackfin: convert irq/process to asm-generic
  Blackfin: convert signal/mmap to asm-generic
  Blackfin: convert locking primitives to asm-generic
  Blackfin: convert termios to asm-generic
  Blackfin: convert simple headers to asm-generic
  Blackfin: convert socket/poll to asm-generic
  Blackfin: convert user/elf to asm-generic
  Blackfin: convert shm/sysv/ipc to asm-generic
  Blackfin: convert asm/ioctls.h to asm-generic/ioctls.h
  Blackfin: only build irqpanic.c when needed
  Blackfin: pull in asm/io.h in ksyms for prototypes
  Blackfin: use common test_bit() rather than __test_bit()

1 files changed, 1 insertions, 42 deletions

diff --git a/arch/blackfin/include/asm/shmbuf.h b/arch/blackfin/include/asm/shmbuf.h
index 612436303e89..83c05fc2de38 100644
--- a/arch/blackfin/include/asm/shmbuf.h
+++ b/arch/blackfin/include/asm/shmbuf.h
@@ -1,42 +1 @@
-#ifndef _BFIN_SHMBUF_H
-#define _BFIN_SHMBUF_H
-
-/*
- * The shmid64_ds structure for bfin architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-        struct ipc64_perm shm_perm;     /* operation perms */
-        size_t shm_segsz;       /* size of segment (bytes) */
-        __kernel_time_t shm_atime;      /* last attach time */
-        unsigned long __unused1;
-        __kernel_time_t shm_dtime;      /* last detach time */
-        unsigned long __unused2;
-        __kernel_time_t shm_ctime;      /* last change time */
-        unsigned long __unused3;
-        __kernel_pid_t shm_cpid;        /* pid of creator */
-        __kernel_pid_t shm_lpid;        /* pid of last operator */
-        unsigned long shm_nattch;       /* no. of current attaches */
-        unsigned long __unused4;
-        unsigned long __unused5;
-};
-
-struct shminfo64 {
-        unsigned long shmmax;
-        unsigned long shmmin;
-        unsigned long shmmni;
-        unsigned long shmseg;
-        unsigned long shmall;
-        unsigned long __unused1;
-        unsigned long __unused2;
-        unsigned long __unused3;
-        unsigned long __unused4;
-};
-
-#endif                          /* _BFIN_SHMBUF_H */
+#include <asm-generic/shmbuf.h>