aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/sys_arm.c2
-rw-r--r--arch/arm/kernel/sys_oabi-compat.c2
-rw-r--r--arch/arm/plat-s3c24xx/dma.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 4d25e49a14f7..9bd1870d980e 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -26,9 +26,9 @@
26#include <linux/fs.h> 26#include <linux/fs.h>
27#include <linux/file.h> 27#include <linux/file.h>
28#include <linux/utsname.h> 28#include <linux/utsname.h>
29#include <linux/ipc.h>
29 30
30#include <asm/uaccess.h> 31#include <asm/uaccess.h>
31#include <asm/ipc.h>
32 32
33extern unsigned long do_mremap(unsigned long addr, unsigned long old_len, 33extern unsigned long do_mremap(unsigned long addr, unsigned long old_len,
34 unsigned long new_len, unsigned long flags, 34 unsigned long new_len, unsigned long flags,
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index 8e2f9bc3368b..e8b98046895b 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -80,7 +80,7 @@
80#include <linux/sem.h> 80#include <linux/sem.h>
81#include <linux/socket.h> 81#include <linux/socket.h>
82#include <linux/net.h> 82#include <linux/net.h>
83#include <asm/ipc.h> 83#include <linux/ipc.h>
84#include <asm/uaccess.h> 84#include <asm/uaccess.h>
85 85
86struct oldabi_stat64 { 86struct oldabi_stat64 {
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 992ca435a922..29696e46ed65 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1272,7 +1272,7 @@ struct sysdev_class dma_sysclass = {
1272 1272
1273/* kmem cache implementation */ 1273/* kmem cache implementation */
1274 1274
1275static void s3c2410_dma_cache_ctor(void *p, struct kmem_cache *c, unsigned long f) 1275static void s3c2410_dma_cache_ctor(struct kmem_cache *c, void *p)
1276{ 1276{
1277 memset(p, 0, sizeof(struct s3c2410_dma_buf)); 1277 memset(p, 0, sizeof(struct s3c2410_dma_buf));
1278} 1278}