port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but...
[openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 005-squashfs_fix.patch
1 --- a/fs/squashfs/inode.c
2 +++ b/fs/squashfs/inode.c
3 @@ -33,6 +33,7 @@
4  #include <linux/fs.h>
5  #include <linux/smp_lock.h>
6  #include <linux/slab.h>
7 +#include <linux/exportfs.h>
8  #include <linux/squashfs_fs_sb.h>
9  #include <linux/squashfs_fs_i.h>
10  #include <linux/buffer_head.h>
11 @@ -43,8 +44,8 @@
12  #include <linux/zlib.h>
13  #include <linux/blkdev.h>
14  #include <linux/vmalloc.h>
15 +#include <linux/semaphore.h>
16  #include <asm/uaccess.h>
17 -#include <asm/semaphore.h>
18  
19  #include "squashfs.h"
20  
21 @@ -2125,7 +2126,7 @@
22  }
23  
24  
25 -static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
26 +static void init_once(void *foo)
27  {
28         struct squashfs_inode_info *ei = foo;
29