qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 02:48:26 +02:00
Code

[kernel] update to 2.6.33.7

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22767 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2010-08-22 17:08:07 +00:00
parent 66eeee56c1
commit fa7498e33f
26 changed files with 91 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -14,8 +14,8 @@ endif
ifeq ($(LINUX_VERSION),2.6.32.20) ifeq ($(LINUX_VERSION),2.6.32.20)
LINUX_KERNEL_MD5SUM:=c254831e3f59b9fef14e61871e5f4738 LINUX_KERNEL_MD5SUM:=c254831e3f59b9fef14e61871e5f4738
endif endif
ifeq ($(LINUX_VERSION),2.6.33.6) ifeq ($(LINUX_VERSION),2.6.33.7)
LINUX_KERNEL_MD5SUM:=7d8f8a4a09866a786fb59c53fba8232a LINUX_KERNEL_MD5SUM:=2cea51deeaa0620a07d005ec3b148f06
endif endif
ifeq ($(LINUX_VERSION),2.6.34.5) ifeq ($(LINUX_VERSION),2.6.34.5)
LINUX_KERNEL_MD5SUM:=d280b596b32f7497bbe9dd54669c99d6 LINUX_KERNEL_MD5SUM:=d280b596b32f7497bbe9dd54669c99d6

4
target/linux/generic/patches-2.6.33/025-mips_disable_fpu.patch
View File

@ -70,7 +70,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
/* Control registers */ /* Control registers */
#define FPCREG_RID 0 /* $0 = revision id */ #define FPCREG_RID 0 /* $0 = revision id */
@@ -1277,7 +1277,6 @@ int fpu_emulator_cop1Handler(struct pt_r @@ -1284,7 +1284,6 @@ int fpu_emulator_cop1Handler(struct pt_r
return sig; return sig;
} }
@ -78,7 +78,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static int fpuemu_stat_get(void *data, u64 *val) static int fpuemu_stat_get(void *data, u64 *val)
@@ -1326,4 +1325,11 @@ static int __init debugfs_fpuemu(void) @@ -1333,4 +1332,11 @@ static int __init debugfs_fpuemu(void)
return 0; return 0;
} }
__initcall(debugfs_fpuemu); __initcall(debugfs_fpuemu);

4
target/linux/generic/patches-2.6.33/030-pci_disable_common_quirks.patch
View File

@ -23,7 +23,7 @@
/* The Mellanox Tavor device gives false positive parity errors /* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow * Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device. * PCI scanning code to "skip" this now blacklisted device.
@@ -1905,7 +1906,9 @@ static void __devinit fixup_rev1_53c810( @@ -1908,7 +1909,9 @@ static void __devinit fixup_rev1_53c810(
} }
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@ -33,7 +33,7 @@
/* Enable 1k I/O space granularity on the Intel P64H2 */ /* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{ {
@@ -2537,6 +2540,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I @@ -2543,6 +2546,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
#endif /* CONFIG_PCI_IOV */ #endif /* CONFIG_PCI_IOV */

6
target/linux/generic/patches-2.6.33/040-compcache_swap_notify_core_support.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/blkdev.h --- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h +++ b/include/linux/blkdev.h
@@ -1301,6 +1301,8 @@ struct block_device_operations { @@ -1299,6 +1299,8 @@ struct block_device_operations {
unsigned long long); unsigned long long);
int (*revalidate_disk) (struct gendisk *); int (*revalidate_disk) (struct gendisk *);
int (*getgeo)(struct block_device *, struct hd_geometry *); int (*getgeo)(struct block_device *, struct hd_geometry *);
@ -11,7 +11,7 @@
--- a/mm/swapfile.c --- a/mm/swapfile.c
+++ b/mm/swapfile.c +++ b/mm/swapfile.c
@@ -574,6 +574,7 @@ static unsigned char swap_entry_free(struct swap_info_struct *p, @@ -574,6 +574,7 @@ static unsigned char swap_entry_free(str
/* free if no reference */ /* free if no reference */
if (!usage) { if (!usage) {
@ -19,7 +19,7 @@
if (offset < p->lowest_bit) if (offset < p->lowest_bit)
p->lowest_bit = offset; p->lowest_bit = offset;
if (offset > p->highest_bit) if (offset > p->highest_bit)
@@ -583,6 +584,8 @@ static unsigned char swap_entry_free(struct swap_info_struct *p, @@ -583,6 +584,8 @@ static unsigned char swap_entry_free(str
swap_list.next = p->type; swap_list.next = p->type;
nr_swap_pages++; nr_swap_pages++;
p->inuse_pages--; p->inuse_pages--;

8
target/linux/generic/patches-2.6.33/110-netfilter_match_speedup.patch
View File

@ -127,10 +127,11 @@
e = (struct ipt_entry *)(loc_cpu_entry + off); e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off if (copy_to_user(userptr + off
@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_ @@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
ret = -EFAULT;
goto free_counters; goto free_counters;
} }
+
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH; + flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off + if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags), + + offsetof(struct ipt_entry, ip.flags),
@ -138,7 +139,6 @@
+ ret = -EFAULT; + ret = -EFAULT;
+ goto free_counters; + goto free_counters;
+ } + }
+
for (i = sizeof(struct ipt_entry); for (i = sizeof(struct ipt_entry);
i < e->target_offset; i < e->target_offset;
i += m->u.match_size) {

6
target/linux/generic/patches-2.6.33/150-netfilter_imq.patch
View File

@ -967,9 +967,9 @@
- struct sk_buff *skb) - struct sk_buff *skb)
+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb) +struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
{ {
u16 queue_index; int queue_index;
struct sock *sk = skb->sk; struct sock *sk = skb->sk;
@@ -1939,6 +1945,7 @@ static struct netdev_queue *dev_pick_tx( @@ -1938,6 +1944,7 @@ static struct netdev_queue *dev_pick_tx(
skb_set_queue_mapping(skb, queue_index); skb_set_queue_mapping(skb, queue_index);
return netdev_get_tx_queue(dev, queue_index); return netdev_get_tx_queue(dev, queue_index);
} }
@ -1110,7 +1110,7 @@
new->csum = old->csum; new->csum = old->csum;
new->local_df = old->local_df; new->local_df = old->local_df;
new->pkt_type = old->pkt_type; new->pkt_type = old->pkt_type;
@@ -2779,6 +2882,13 @@ void __init skb_init(void) @@ -2780,6 +2883,13 @@ void __init skb_init(void)
0, 0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL); NULL);

8
target/linux/generic/patches-2.6.33/511-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

99
target/linux/generic/patches-2.6.33/975-ssb_update.patch
View File

@ -1,15 +1,6 @@
--- a/drivers/ssb/driver_chipcommon.c --- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c +++ b/drivers/ssb/driver_chipcommon.c
@@ -233,6 +233,8 @@ void ssb_chipcommon_init(struct ssb_chip @@ -373,6 +373,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
{
if (!cc->dev)
return; /* We don't have a ChipCommon */
+ if (cc->dev->id.revision >= 11)
+ cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
ssb_pmu_init(cc);
chipco_powercontrol_init(cc);
ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
@@ -370,6 +372,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
{ {
return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value); return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
} }
@ -124,55 +115,11 @@
} }
return err; return err;
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -167,7 +167,7 @@ err_pci:
}
/* Get the word-offset for a SSB_SPROM_XXX define. */
-#define SPOFF(offset) (((offset) - SSB_SPROM_BASE) / sizeof(u16))
+#define SPOFF(offset) ((offset) / sizeof(u16))
/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
#define SPEX16(_outvar, _offset, _mask, _shift) \
out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
@@ -253,7 +253,7 @@ static int sprom_do_read(struct ssb_bus
int i;
for (i = 0; i < bus->sprom_size; i++)
- sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
+ sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));
return 0;
}
@@ -284,7 +284,7 @@ static int sprom_do_write(struct ssb_bus
ssb_printk("75%%");
else if (i % 2)
ssb_printk(".");
- writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2));
+ writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
mmiowb();
msleep(20);
}
@@ -620,6 +620,14 @@ static int ssb_pci_sprom_get(struct ssb_
int err = -ENOMEM;
u16 *buf;
+ if (!ssb_is_sprom_available(bus)) {
+ ssb_printk(KERN_ERR PFX "No SPROM available!\n");
+ return -ENODEV;
+ }
+
+ bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ?
+ SSB_SPROM_BASE1 : SSB_SPROM_BASE31;
+
buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
if (!buf)
goto out;
--- a/drivers/ssb/sprom.c --- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c +++ b/drivers/ssb/sprom.c
@@ -175,3 +175,17 @@ const struct ssb_sprom *ssb_get_fallback @@ -190,3 +190,17 @@ bool ssb_is_sprom_available(struct ssb_b
{
return fallback_sprom; return true;
} }
+ +
+/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */ +/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
@ -215,9 +162,9 @@
u16 chip_rev; u16 chip_rev;
+ u16 sprom_offset; + u16 sprom_offset;
u16 sprom_size; /* number of words in sprom */ u16 sprom_size; /* number of words in sprom */
u16 sprom_offset;
u8 chip_package; u8 chip_package;
@@ -395,6 +396,9 @@ extern int ssb_bus_sdiobus_register(stru
@@ -394,6 +395,9 @@ extern int ssb_bus_sdiobus_register(stru
extern void ssb_bus_unregister(struct ssb_bus *bus); extern void ssb_bus_unregister(struct ssb_bus *bus);
@ -229,7 +176,7 @@
extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom); extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
--- a/include/linux/ssb/ssb_driver_chipcommon.h --- a/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/include/linux/ssb/ssb_driver_chipcommon.h +++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -53,6 +53,7 @@ @@ -54,6 +54,7 @@
#define SSB_CHIPCO_CAP_64BIT 0x08000000 /* 64-bit Backplane */ #define SSB_CHIPCO_CAP_64BIT 0x08000000 /* 64-bit Backplane */
#define SSB_CHIPCO_CAP_PMU 0x10000000 /* PMU available (rev >= 20) */ #define SSB_CHIPCO_CAP_PMU 0x10000000 /* PMU available (rev >= 20) */
#define SSB_CHIPCO_CAP_ECI 0x20000000 /* ECI available (rev >= 20) */ #define SSB_CHIPCO_CAP_ECI 0x20000000 /* ECI available (rev >= 20) */
@ -237,7 +184,7 @@
#define SSB_CHIPCO_CORECTL 0x0008 #define SSB_CHIPCO_CORECTL 0x0008
#define SSB_CHIPCO_CORECTL_UARTCLK0 0x00000001 /* Drive UART with internal clock */ #define SSB_CHIPCO_CORECTL_UARTCLK0 0x00000001 /* Drive UART with internal clock */
#define SSB_CHIPCO_CORECTL_SE 0x00000002 /* sync clk out enable (corerev >= 3) */ #define SSB_CHIPCO_CORECTL_SE 0x00000002 /* sync clk out enable (corerev >= 3) */
@@ -385,6 +386,7 @@ @@ -386,6 +387,7 @@
/** Chip specific Chip-Status register contents. */ /** Chip specific Chip-Status register contents. */
@ -245,7 +192,7 @@
#define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL 0x00000003 #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL 0x00000003
#define SSB_CHIPCO_CHST_4325_DEFCIS_SEL 0 /* OTP is powered up, use def. CIS, no SPROM */ #define SSB_CHIPCO_CHST_4325_DEFCIS_SEL 0 /* OTP is powered up, use def. CIS, no SPROM */
#define SSB_CHIPCO_CHST_4325_SPROM_SEL 1 /* OTP is powered up, SPROM is present */ #define SSB_CHIPCO_CHST_4325_SPROM_SEL 1 /* OTP is powered up, SPROM is present */
@@ -398,6 +400,18 @@ @@ -399,6 +401,18 @@
#define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT 4 #define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT 4
#define SSB_CHIPCO_CHST_4325_PMUTOP_2B 0x00000200 /* 1 for 2b, 0 for to 2a */ #define SSB_CHIPCO_CHST_4325_PMUTOP_2B 0x00000200 /* 1 for 2b, 0 for to 2a */
@ -264,27 +211,9 @@
/** Clockcontrol masks and values **/ /** Clockcontrol masks and values **/
@@ -564,6 +578,7 @@ struct ssb_chipcommon_pmu {
struct ssb_chipcommon {
struct ssb_device *dev;
u32 capabilities;
+ u32 status;
/* Fast Powerup Delay constant */
u16 fast_pwrup_delay;
struct ssb_chipcommon_pmu pmu;
--- a/include/linux/ssb/ssb_regs.h --- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h +++ b/include/linux/ssb/ssb_regs.h
@@ -170,26 +170,27 @@ @@ -178,19 +178,19 @@
#define SSB_SPROMSIZE_WORDS_R4 220
#define SSB_SPROMSIZE_BYTES_R123 (SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
#define SSB_SPROMSIZE_BYTES_R4 (SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
-#define SSB_SPROM_BASE 0x1000
-#define SSB_SPROM_REVISION 0x107E
+#define SSB_SPROM_BASE1 0x1000
+#define SSB_SPROM_BASE31 0x0800
+#define SSB_SPROM_REVISION 0x007E
#define SSB_SPROM_REVISION_REV 0x00FF /* SPROM Revision number */
#define SSB_SPROM_REVISION_CRC 0xFF00 /* SPROM CRC8 value */
#define SSB_SPROM_REVISION_CRC_SHIFT 8 #define SSB_SPROM_REVISION_CRC_SHIFT 8
/* SPROM Revision 1 */ /* SPROM Revision 1 */
@ -312,7 +241,7 @@
#define SSB_SPROM1_BINF_BREV 0x00FF /* Board Revision */ #define SSB_SPROM1_BINF_BREV 0x00FF /* Board Revision */
#define SSB_SPROM1_BINF_CCODE 0x0F00 /* Country Code */ #define SSB_SPROM1_BINF_CCODE 0x0F00 /* Country Code */
#define SSB_SPROM1_BINF_CCODE_SHIFT 8 #define SSB_SPROM1_BINF_CCODE_SHIFT 8
@@ -197,63 +198,63 @@ @@ -198,63 +198,63 @@
#define SSB_SPROM1_BINF_ANTBG_SHIFT 12 #define SSB_SPROM1_BINF_ANTBG_SHIFT 12
#define SSB_SPROM1_BINF_ANTA 0xC000 /* Available A-PHY antennas */ #define SSB_SPROM1_BINF_ANTA 0xC000 /* Available A-PHY antennas */
#define SSB_SPROM1_BINF_ANTA_SHIFT 14 #define SSB_SPROM1_BINF_ANTA_SHIFT 14
@ -404,7 +333,7 @@
#define SSB_SPROM3_CCKPO_1M 0x000F /* 1M Rate PO */ #define SSB_SPROM3_CCKPO_1M 0x000F /* 1M Rate PO */
#define SSB_SPROM3_CCKPO_2M 0x00F0 /* 2M Rate PO */ #define SSB_SPROM3_CCKPO_2M 0x00F0 /* 2M Rate PO */
#define SSB_SPROM3_CCKPO_2M_SHIFT 4 #define SSB_SPROM3_CCKPO_2M_SHIFT 4
@@ -264,100 +265,100 @@ @@ -265,100 +265,100 @@
#define SSB_SPROM3_OFDMGPO 0x107A /* G-PHY OFDM Power Offset (4 bytes, BigEndian) */ #define SSB_SPROM3_OFDMGPO 0x107A /* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
/* SPROM Revision 4 */ /* SPROM Revision 4 */
@ -562,7 +491,7 @@
#define SSB_SPROM8_RSSISMF2G 0x000F #define SSB_SPROM8_RSSISMF2G 0x000F
#define SSB_SPROM8_RSSISMC2G 0x00F0 #define SSB_SPROM8_RSSISMC2G 0x00F0
#define SSB_SPROM8_RSSISMC2G_SHIFT 4 #define SSB_SPROM8_RSSISMC2G_SHIFT 4
@@ -365,7 +366,7 @@ @@ -366,7 +366,7 @@
#define SSB_SPROM8_RSSISAV2G_SHIFT 8 #define SSB_SPROM8_RSSISAV2G_SHIFT 8
#define SSB_SPROM8_BXA2G 0x1800 #define SSB_SPROM8_BXA2G 0x1800
#define SSB_SPROM8_BXA2G_SHIFT 11 #define SSB_SPROM8_BXA2G_SHIFT 11
@ -571,7 +500,7 @@
#define SSB_SPROM8_RSSISMF5G 0x000F #define SSB_SPROM8_RSSISMF5G 0x000F
#define SSB_SPROM8_RSSISMC5G 0x00F0 #define SSB_SPROM8_RSSISMC5G 0x00F0
#define SSB_SPROM8_RSSISMC5G_SHIFT 4 #define SSB_SPROM8_RSSISMC5G_SHIFT 4
@@ -373,47 +374,47 @@ @@ -374,47 +374,47 @@
#define SSB_SPROM8_RSSISAV5G_SHIFT 8 #define SSB_SPROM8_RSSISAV5G_SHIFT 8
#define SSB_SPROM8_BXA5G 0x1800 #define SSB_SPROM8_BXA5G 0x1800
#define SSB_SPROM8_BXA5G_SHIFT 11 #define SSB_SPROM8_BXA5G_SHIFT 11

2
target/linux/generic/patches-2.6.33/977-ssb_export_fallback_sprom.patch
View File

@ -10,7 +10,7 @@
bool ssb_is_sprom_available(struct ssb_bus *bus) bool ssb_is_sprom_available(struct ssb_bus *bus)
--- a/include/linux/ssb/ssb.h --- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h
@@ -401,6 +401,7 @@ extern bool ssb_is_sprom_available(struc @@ -402,6 +402,7 @@ extern bool ssb_is_sprom_available(struc
/* Set a fallback SPROM. /* Set a fallback SPROM.
* See kdoc at the function definition for complete documentation. */ * See kdoc at the function definition for complete documentation. */
extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom); extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);

4
target/linux/generic/patches-2.6.33/980-vm_exports.patch
View File

@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround * macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c --- a/kernel/sched.c
+++ b/kernel/sched.c +++ b/kernel/sched.c
@@ -6171,6 +6171,7 @@ int can_nice(const struct task_struct *p @@ -6174,6 +6174,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE)); capable(CAP_SYS_NICE));
} }
@ -132,7 +132,7 @@
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
--- a/kernel/signal.c --- a/kernel/signal.c
+++ b/kernel/signal.c +++ b/kernel/signal.c
@@ -1104,6 +1104,7 @@ struct sighand_struct *lock_task_sighand @@ -1106,6 +1106,7 @@ struct sighand_struct *lock_task_sighand
return sighand; return sighand;
} }

2
target/linux/ifxmips/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Infineon Mips
FEATURES:=squashfs jffs2 atm FEATURES:=squashfs jffs2 atm
SUBTARGETS:=danube ar9 SUBTARGETS:=danube ar9
LINUX_VERSION:=2.6.33.6 LINUX_VERSION:=2.6.33.7
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time

2
target/linux/ifxmips/patches-2.6.33/200-cfi-swap.patch
View File

@ -38,7 +38,7 @@
#define MAX_WORD_RETRIES 3 #define MAX_WORD_RETRIES 3
@@ -1096,7 +1096,9 @@ static int __xipram do_write_oneword(str @@ -1096,7 +1100,9 @@ static int __xipram do_write_oneword(str
int retry_cnt = 0; int retry_cnt = 0;
adr += chip->start; adr += chip->start;

2
target/linux/mpc83xx/Makefile
View File

@ -11,7 +11,7 @@ BOARD:=mpc83xx
BOARDNAME:=Freescale MPC83xx BOARDNAME:=Freescale MPC83xx
FEATURES:=squashfs targz broken FEATURES:=squashfs targz broken
LINUX_VERSION:=2.6.33.6 LINUX_VERSION:=2.6.33.7
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk