qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 20:04:05 +02:00
Code

kernel: some updates for kernel 2.6.39

Browse Source 
* add md5sum for kernel
* add some missing config symbols
* add some ssb patches to make compat-wireless compile

Thank you Peter Wagner for the patch


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27009 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2011-05-25 19:32:00 +00:00
parent a3c9e2fe7a
commit c77971e8b4
27 changed files with 215 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/kernel-version.mk
View File

@ -26,6 +26,9 @@ endif
ifeq ($(LINUX_VERSION),2.6.38.6) ifeq ($(LINUX_VERSION),2.6.38.6)
LINUX_KERNEL_MD5SUM:=e896a3bb3185b8a8af8e2f010f63c02e LINUX_KERNEL_MD5SUM:=e896a3bb3185b8a8af8e2f010f63c02e
endif endif
ifeq ($(LINUX_VERSION),2.6.39)
LINUX_KERNEL_MD5SUM:=1aab7a741abe08d42e8eccf20de61e05
endif
# disable the md5sum check for unknown kernel versions # disable the md5sum check for unknown kernel versions
LINUX_KERNEL_MD5SUM?=x LINUX_KERNEL_MD5SUM?=x

7
target/linux/generic/config-2.6.39
View File

@ -1120,6 +1120,8 @@ CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IR_SONY_DECODER is not set # CONFIG_IR_SONY_DECODER is not set
# CONFIG_IR_STREAMZAP is not set # CONFIG_IR_STREAMZAP is not set
# CONFIG_ISCSI_BOOT_SYSFS is not set # CONFIG_ISCSI_BOOT_SYSFS is not set
# CONFIG_SCSI_CXGB3_ISCSI is not set
# CONFIG_SCSI_CXGB4_ISCSI is not set
# CONFIG_ISCSI_TCP is not set # CONFIG_ISCSI_TCP is not set
CONFIG_ISDN=y CONFIG_ISDN=y
# CONFIG_ISDN_AUDIO is not set # CONFIG_ISDN_AUDIO is not set
@ -1458,6 +1460,7 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_PHYSMAP_COMPAT is not set # CONFIG_MTD_PHYSMAP_COMPAT is not set
# CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PLATRAM is not set
# CONFIG_MTD_LATCH_ADDR is not set
# CONFIG_MTD_PMC551 is not set # CONFIG_MTD_PMC551 is not set
# CONFIG_MTD_RAM is not set # CONFIG_MTD_RAM is not set
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
@ -1938,6 +1941,7 @@ CONFIG_PROC_SYSCTL=y
# CONFIG_R8169 is not set # CONFIG_R8169 is not set
# CONFIG_R8187SE is not set # CONFIG_R8187SE is not set
# CONFIG_R8712U is not set # CONFIG_R8712U is not set
# CONFIG_RTS_PSTOR is not set
# CONFIG_RADIO_ADAPTERS is not set # CONFIG_RADIO_ADAPTERS is not set
# CONFIG_RADIO_AZTECH is not set # CONFIG_RADIO_AZTECH is not set
# CONFIG_RADIO_CADET is not set # CONFIG_RADIO_CADET is not set
@ -2104,6 +2108,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_ARCMSR is not set # CONFIG_SCSI_ARCMSR is not set
# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_BFA_FC is not set
# CONFIG_SCSI_BNX2_ISCSI is not set # CONFIG_SCSI_BNX2_ISCSI is not set
# CONFIG_SCSI_BNX2X_FCOE is not set
# CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DC390T is not set
@ -2869,8 +2874,10 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
# CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE is not set
CONFIG_USB_STORAGE_ALAUDA=y CONFIG_USB_STORAGE_ALAUDA=y
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_DATAFAB=y
# CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_REALTEK is not set
CONFIG_USB_STORAGE_FREECOM=y CONFIG_USB_STORAGE_FREECOM=y
# CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_ISD200 is not set
CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_JUMPSHOT=y

77
target/linux/generic/patches-2.6.39/021-ssb_commit_settings_export.patch Normal file
View File

@ -0,0 +1,77 @@
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -476,30 +476,6 @@ static void ssb_pcie_mdio_write(struct s
pcicore_write32(pc, mdio_control, 0);
}
-static void ssb_broadcast_value(struct ssb_device *dev,
- u32 address, u32 data)
-{
- /* This is used for both, PCI and ChipCommon core, so be careful. */
- BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
- BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
-
- ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
- ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
- ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
- ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
-}
-
-static void ssb_commit_settings(struct ssb_bus *bus)
-{
- struct ssb_device *dev;
-
- dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
- if (WARN_ON(!dev))
- return;
- /* This forces an update of the cached registers. */
- ssb_broadcast_value(dev, 0xFD8, 0);
-}
-
int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
struct ssb_device *dev)
{
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1330,6 +1330,31 @@ error:
}
EXPORT_SYMBOL(ssb_bus_powerup);
+static void ssb_broadcast_value(struct ssb_device *dev,
+ u32 address, u32 data)
+{
+ /* This is used for both, PCI and ChipCommon core, so be careful. */
+ BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
+ BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
+
+ ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
+ ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
+ ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
+ ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
+}
+
+void ssb_commit_settings(struct ssb_bus *bus)
+{
+ struct ssb_device *dev;
+
+ dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
+ if (WARN_ON(!dev))
+ return;
+ /* This forces an update of the cached registers. */
+ ssb_broadcast_value(dev, 0xFD8, 0);
+}
+EXPORT_SYMBOL(ssb_commit_settings);
+
u32 ssb_admatch_base(u32 adm)
{
u32 base = 0;
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -518,6 +518,7 @@ extern int ssb_bus_may_powerdown(struct
* Otherwise static always-on powercontrol will be used. */
extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
+extern void ssb_commit_settings(struct ssb_bus *bus);
/* Various helper functions */
extern u32 ssb_admatch_base(u32 adm);

49
target/linux/generic/patches-2.6.39/022-ssb_pcicore_build_breakage.patch Normal file
View File

@ -0,0 +1,49 @@
From 1159024d4c0aafecaa0c6635c55153b4b39cc1c8 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Fri, 13 May 2011 09:23:47 -0400
Subject: [PATCH] ssb: fix pcicore build breakage
drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/ssb/main.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1333,21 +1333,27 @@ EXPORT_SYMBOL(ssb_bus_powerup);
static void ssb_broadcast_value(struct ssb_device *dev,
u32 address, u32 data)
{
+#ifdef CONFIG_SSB_DRIVER_PCICORE
/* This is used for both, PCI and ChipCommon core, so be careful. */
BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
+#endif
- ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
- ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
- ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
- ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
+ ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
+ ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
+ ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
+ ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
}
void ssb_commit_settings(struct ssb_bus *bus)
{
struct ssb_device *dev;
+#ifdef CONFIG_SSB_DRIVER_PCICORE
dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
+#else
+ dev = bus->chipco.dev;
+#endif
if (WARN_ON(!dev))
return;
/* This forces an update of the cached registers. */

6
target/linux/generic/patches-2.6.39/100-overlayfs.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1595,6 +1595,7 @@ struct inode_operations { @@ -1594,6 +1594,7 @@ struct inode_operations {
void (*truncate_range)(struct inode *, loff_t, loff_t); void (*truncate_range)(struct inode *, loff_t, loff_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len); u64 len);
@ -8,7 +8,7 @@
} ____cacheline_aligned; } ____cacheline_aligned;
struct seq_file; struct seq_file;
@@ -1989,6 +1990,7 @@ extern long do_sys_open(int dfd, const c @@ -1988,6 +1989,7 @@ extern long do_sys_open(int dfd, const c
extern struct file *filp_open(const char *, int, int); extern struct file *filp_open(const char *, int, int);
extern struct file *file_open_root(struct dentry *, struct vfsmount *, extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int); const char *, int);
@ -184,7 +184,7 @@
struct pipe_inode_info *opipe, struct pipe_inode_info *opipe,
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -1510,6 +1510,23 @@ void drop_collected_mounts(struct vfsmou @@ -1494,6 +1494,23 @@ void drop_collected_mounts(struct vfsmou
release_mounts(&umount_list); release_mounts(&umount_list);
} }

2
target/linux/generic/patches-2.6.39/300-mips_expose_boot_raw.patch
View File

@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480 config CEVT_BCM1480
bool bool
@@ -2252,6 +2249,18 @@ config USE_OF @@ -2247,6 +2244,18 @@ config USE_OF
help help
Include support for flattened device tree machine descriptions. Include support for flattened device tree machine descriptions.

6
target/linux/generic/patches-2.6.39/400-rootfs_split.patch
View File

@ -193,7 +193,7 @@
/* /*
* This function, given a master MTD object and a partition table, creates * This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to * and registers slave MTD objects which are bound to the master according to
@@ -652,6 +801,9 @@ int add_mtd_partitions(struct mtd_info * @@ -652,6 +803,9 @@ int add_mtd_partitions(struct mtd_info *
struct mtd_part *slave; struct mtd_part *slave;
uint64_t cur_offset = 0; uint64_t cur_offset = 0;
int i; int i;
@ -203,7 +203,7 @@
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
@@ -666,6 +818,21 @@ int add_mtd_partitions(struct mtd_info * @@ -666,6 +820,21 @@ int add_mtd_partitions(struct mtd_info *
add_mtd_device(&slave->mtd); add_mtd_device(&slave->mtd);
@ -225,7 +225,7 @@
cur_offset = slave->offset + slave->mtd.size; cur_offset = slave->offset + slave->mtd.size;
} }
@@ -673,6 +840,32 @@ int add_mtd_partitions(struct mtd_info * @@ -673,6 +842,32 @@ int add_mtd_partitions(struct mtd_info *
} }
EXPORT_SYMBOL(add_mtd_partitions); EXPORT_SYMBOL(add_mtd_partitions);

8
target/linux/generic/patches-2.6.39/501-yaffs_cvs_2009_04_24.patch
View File

@ -11038,14 +11038,14 @@
+ yaffs_UnpackTags2(tags, &pt); + yaffs_UnpackTags2(tags, &pt);
+ } + }
+ } + }
+
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ if (localData) + if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__); + yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) + if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED; tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-
if (retval == 0) if (retval == 0)
return YAFFS_OK; return YAFFS_OK;
else else

6
target/linux/generic/patches-2.6.39/722-phy_mvswitch.patch
View File

@ -1,8 +1,8 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -102,6 +102,9 @@ config ADM6996_PHY @@ -104,6 +104,9 @@ config ADM6996_PHY
---help--- Currently supports the ADM6996FC and ADM6996M switches.
Currently supports the ADM6996F switch Support for FC is very limited.
+config MVSWITCH_PHY +config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches" + tristate "Driver for Marvell 88E6060 switches"

2
target/linux/generic/patches-2.6.39/723-phy_ip175c.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -105,6 +105,10 @@ config ADM6996_PHY @@ -107,6 +107,10 @@ config ADM6996_PHY
config MVSWITCH_PHY config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches" tristate "Driver for Marvell 88E6060 switches"

2
target/linux/generic/patches-2.6.39/724-phy_ar8216.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -109,6 +109,10 @@ config IP17XX_PHY @@ -111,6 +111,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches" tristate "Driver for IC+ IP17xx switches"
select SWCONFIG select SWCONFIG

2
target/linux/generic/patches-2.6.39/725-phy_rtl8306.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -113,6 +113,10 @@ config AR8216_PHY @@ -115,6 +115,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches" tristate "Driver for Atheros AR8216 switches"
select SWCONFIG select SWCONFIG

2
target/linux/generic/patches-2.6.39/726-phy_rtl8366.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -155,4 +155,29 @@ config MDIO_OCTEON @@ -157,4 +157,29 @@ config MDIO_OCTEON
If in doubt, say Y. If in doubt, say Y.

4
target/linux/generic/patches-2.6.39/811-pci_disable_usb_common_quirks.patch
View File

@ -1,7 +1,7 @@
--- a/drivers/usb/host/pci-quirks.c --- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c
@@ -392,6 +392,8 @@ reset_needed: @@ -423,6 +423,8 @@ reset_needed:
} }
EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
@ -10,7 +10,7 @@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{ {
u16 cmd; u16 cmd;
@@ -736,3 +738,5 @@ static void __devinit quirk_usb_early_ha @@ -767,3 +769,5 @@ static void __devinit quirk_usb_early_ha
quirk_usb_handoff_xhci(pdev); quirk_usb_handoff_xhci(pdev);
} }
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);

6
target/linux/generic/patches-2.6.39/863-gpiommc.patch
View File

@ -829,9 +829,9 @@
+be done automatically. +be done automatically.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2888,6 +2888,11 @@ T: git git://git.kernel.org/pub/scm/linu @@ -2896,6 +2896,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Maintained S: Odd Fixes
F: drivers/media/video/gspca/ F: drivers/tty/hvc/
+GPIOMMC DRIVER +GPIOMMC DRIVER
+P: Michael Buesch +P: Michael Buesch

2
target/linux/generic/patches-2.6.39/941-ocf_20100325.patch
View File

@ -160,7 +160,7 @@
--- a/kernel/pid.c --- a/kernel/pid.c
+++ b/kernel/pid.c +++ b/kernel/pid.c
@@ -424,6 +424,7 @@ struct task_struct *find_task_by_vpid(pi @@ -427,6 +427,7 @@ struct task_struct *find_task_by_vpid(pi
{ {
return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns); return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
} }

10
target/linux/generic/patches-2.6.39/950-vm_exports.patch
View File

@ -1,6 +1,6 @@
--- a/mm/shmem.c --- a/mm/shmem.c
+++ b/mm/shmem.c +++ b/mm/shmem.c
@@ -2711,6 +2711,16 @@ out: @@ -2730,6 +2730,16 @@ out:
/* common code */ /* common code */
@ -17,7 +17,7 @@
/** /**
* shmem_file_setup - get an unlinked file living in tmpfs * shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps * @name: name for dentry (to be seen in /proc/<pid>/maps
@@ -2788,10 +2798,7 @@ int shmem_zero_setup(struct vm_area_stru @@ -2807,10 +2817,7 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file)) if (IS_ERR(file))
return PTR_ERR(file); return PTR_ERR(file);
@ -32,7 +32,7 @@
} }
--- a/fs/file.c --- a/fs/file.c
+++ b/fs/file.c +++ b/fs/file.c
@@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi @@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi
/* All good, so we try */ /* All good, so we try */
return expand_fdtable(files, nr); return expand_fdtable(files, nr);
} }
@ -78,7 +78,7 @@
/** /**
* zap_vma_ptes - remove ptes mapping the vma * zap_vma_ptes - remove ptes mapping the vma
@@ -2756,6 +2757,7 @@ int vmtruncate_range(struct inode *inode @@ -2763,6 +2764,7 @@ int vmtruncate_range(struct inode *inode
return 0; return 0;
} }
@ -106,7 +106,7 @@
void *caller) void *caller)
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -871,6 +871,7 @@ extern void __show_free_areas(unsigned i @@ -872,6 +872,7 @@ extern void __show_free_areas(unsigned i
int shmem_lock(struct file *file, int lock, struct user_struct *user); int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);