kernel: add some fixes for kernel 3.9
This patch fixes some compile problems with kernel 3.9 and adds some missing linux 3.9 handling into kernel packages. SVN-Revision: 36098
This commit is contained in:
parent
99638c5288
commit
c9544f4af0
7 changed files with 50 additions and 6 deletions
|
@ -473,7 +473,7 @@ $(eval $(call KernelPackage,pcnet32))
|
|||
define KernelPackage/tg3
|
||||
TITLE:=Broadcom Tigon3 Gigabit Ethernet
|
||||
KCONFIG:=CONFIG_TIGON3
|
||||
DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +LINUX_3_8:kmod-ptp
|
||||
DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +(LINUX_3_8||LINUX_3_9):kmod-ptp
|
||||
SUBMENU:=$(NETWORK_DEVICES_MENU)
|
||||
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
|
||||
AUTOLOAD:=$(call AutoLoad,50,tg3)
|
||||
|
|
|
@ -157,7 +157,7 @@ $(eval $(call KernelPackage,usb2))
|
|||
|
||||
define KernelPackage/usb2-pci
|
||||
TITLE:=Support for PCI USB2 controllers
|
||||
DEPENDS:=@PCI_SUPPORT @LINUX_3_8 +kmod-usb2
|
||||
DEPENDS:=@PCI_SUPPORT @(LINUX_3_8||LINUX_3_9) +kmod-usb2
|
||||
KCONFIG:=CONFIG_USB_EHCI_PCI
|
||||
FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko
|
||||
AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1)
|
||||
|
|
16
package/network/utils/ipset/patches/001-fix-kernel-3.9.patch
Normal file
16
package/network/utils/ipset/patches/001-fix-kernel-3.9.patch
Normal file
|
@ -0,0 +1,16 @@
|
|||
--- a/kernel/net/netfilter/ipset/ip_set_core.c
|
||||
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
|
||||
@@ -27,6 +27,13 @@
|
||||
#include <linux/netfilter/nfnetlink.h>
|
||||
#include <linux/netfilter/ipset/ip_set.h>
|
||||
|
||||
+#ifndef IPSET_IN_KERNEL_TREE
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
|
||||
+#define nfnl_unlock() nfnl_unlock(NFNL_SUBSYS_IPSET)
|
||||
+#define nfnl_lock() nfnl_lock(NFNL_SUBSYS_IPSET)
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
static LIST_HEAD(ip_set_type_list); /* all registered set types */
|
||||
static DEFINE_MUTEX(ip_set_type_mutex); /* protects ip_set_type_list */
|
||||
static DEFINE_RWLOCK(ip_set_ref_lock); /* protects the set refs */
|
|
@ -0,0 +1,14 @@
|
|||
--- a/extensions/compat_xtables.h
|
||||
+++ b/extensions/compat_xtables.h
|
||||
@@ -57,4 +57,11 @@
|
||||
|
||||
#define xt_request_find_match xtnu_request_find_match
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
|
||||
+static inline void proc_net_remove(struct net *net, const char *name)
|
||||
+{
|
||||
+ remove_proc_entry(name, net->proc_net);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#endif /* _XTABLES_COMPAT_H */
|
|
@ -39,6 +39,20 @@
|
|||
|
||||
enum regmap_endian {
|
||||
/* Unspecified -> 0 -> Backwards compatible default */
|
||||
--- a/drivers/base/regmap/Makefile
|
||||
+++ b/drivers/base/regmap/Makefile
|
||||
@@ -1,6 +1,8 @@
|
||||
-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
|
||||
-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
|
||||
-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
|
||||
+regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o regcache-flat.o
|
||||
+ifdef CONFIG_DEBUG_FS
|
||||
+regmap-core-objs += regmap-debugfs.o
|
||||
+endif
|
||||
+obj-$(CONFIG_REGMAP) += regmap-core.o
|
||||
obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
|
||||
obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
|
||||
obj-$(CONFIG_REGMAP_MMIO) += regmap-mmio.o
|
||||
--- a/drivers/base/regmap/regmap.c
|
||||
+++ b/drivers/base/regmap/regmap.c
|
||||
@@ -13,6 +13,7 @@
|
||||
|
|
Loading…
Reference in a new issue