diff options
| author | Robert P. J. Day <rpjday@mindspring.com> | 2007-07-18 23:36:36 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-22 14:49:21 +1000 |
| commit | 20b31b53ea87e598ea8159f109b4217ad185fce5 (patch) | |
| tree | bf39812f93191926d53e10ce376c530d4853435f | |
| parent | 555ddbb4e2191c8823df2d61525218ac39481385 (diff) | |
| download | op-kernel-dev-20b31b53ea87e598ea8159f109b4217ad185fce5.zip op-kernel-dev-20b31b53ea87e598ea8159f109b4217ad185fce5.tar.gz | |
[POWERPC] Prevent direct inclusion of <asm/rwsem.h>.
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/ppc/syslib/ocp.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/rwsem.h | 4 | ||||
| -rw-r--r-- | include/asm-ppc/ocp.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c index 491fe9a..3f5be2c 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c @@ -44,11 +44,11 @@ #include <linux/pm.h> #include <linux/bootmem.h> #include <linux/device.h> +#include <linux/rwsem.h> #include <asm/io.h> #include <asm/ocp.h> #include <asm/errno.h> -#include <asm/rwsem.h> #include <asm/semaphore.h> //#define DBG(x) printk x diff --git a/include/asm-powerpc/rwsem.h b/include/asm-powerpc/rwsem.h index e929145..cefc147 100644 --- a/include/asm-powerpc/rwsem.h +++ b/include/asm-powerpc/rwsem.h @@ -1,6 +1,10 @@ #ifndef _ASM_POWERPC_RWSEM_H #define _ASM_POWERPC_RWSEM_H +#ifndef _LINUX_RWSEM_H +#error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead." +#endif + #ifdef __KERNEL__ /* diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h index 16dbc7d..1379a4f 100644 --- a/include/asm-ppc/ocp.h +++ b/include/asm-ppc/ocp.h @@ -27,10 +27,10 @@ #include <linux/init.h> #include <linux/list.h> #include <linux/device.h> +#include <linux/rwsem.h> #include <asm/mmu.h> #include <asm/ocp_ids.h> -#include <asm/rwsem.h> #include <asm/semaphore.h> #ifdef CONFIG_PPC_OCP |
