aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.32
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.32')
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/510-yaffs_support.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch6
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
index 48b649195e..4c98b73f87 100644
--- a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
@@ -127,7 +127,7 @@
+}
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
-@@ -87,6 +87,7 @@
+@@ -87,6 +87,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
@@ -137,7 +137,7 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -854,6 +854,9 @@
+@@ -854,6 +854,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K
bool
@@ -157,7 +157,7 @@
unsigned int vced_count, vcei_count;
-@@ -31,8 +32,12 @@
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
/*
* For the first processor also print the system type
*/
diff --git a/target/linux/generic-2.6/patches-2.6.32/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.32/510-yaffs_support.patch
index fe549c30c1..e490452e58 100644
--- a/target/linux/generic-2.6/patches-2.6.32/510-yaffs_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/510-yaffs_support.patch
@@ -10,7 +10,7 @@
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -126,3 +126,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2/
+@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2/
obj-$(CONFIG_BTRFS_FS) += btrfs/
obj-$(CONFIG_GFS2_FS) += gfs2/
obj-$(CONFIG_EXOFS_FS) += exofs/
diff --git a/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
index 91f85c2b61..724b1f030c 100644
--- a/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2775,6 +2775,16 @@ int shmem_lock(struct file *file, int lo
+@@ -2608,6 +2608,16 @@ int shmem_lock(struct file *file, int lo
/* common code */
@@ -17,7 +17,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2854,9 +2864,6 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2687,9 +2697,6 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file))
return PTR_ERR(file);
@@ -68,7 +68,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -6075,6 +6075,7 @@ int can_nice(const struct task_struct *p
+@@ -6095,6 +6095,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}