kernel: generic: refresh patches for 3.1-rc2
SVN-Revision: 28021
This commit is contained in:
parent
d132f4c1c2
commit
3e94ee9642
4 changed files with 5 additions and 14 deletions
|
@ -238,7 +238,7 @@
|
||||||
obj-$(CONFIG_OMFS_FS) += omfs/
|
obj-$(CONFIG_OMFS_FS) += omfs/
|
||||||
--- a/fs/ecryptfs/main.c
|
--- a/fs/ecryptfs/main.c
|
||||||
+++ b/fs/ecryptfs/main.c
|
+++ b/fs/ecryptfs/main.c
|
||||||
@@ -525,6 +525,13 @@ static struct dentry *ecryptfs_mount(str
|
@@ -544,6 +544,13 @@ static struct dentry *ecryptfs_mount(str
|
||||||
s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
|
s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
|
||||||
s->s_blocksize = path.dentry->d_sb->s_blocksize;
|
s->s_blocksize = path.dentry->d_sb->s_blocksize;
|
||||||
s->s_magic = ECRYPTFS_SUPER_MAGIC;
|
s->s_magic = ECRYPTFS_SUPER_MAGIC;
|
||||||
|
|
|
@ -28,10 +28,10 @@
|
||||||
depends on BROKEN || !FRV
|
depends on BROKEN || !FRV
|
||||||
--- a/kernel/Makefile
|
--- a/kernel/Makefile
|
||||||
+++ b/kernel/Makefile
|
+++ b/kernel/Makefile
|
||||||
@@ -107,6 +107,7 @@ obj-$(CONFIG_PERF_EVENTS) += events/
|
@@ -108,6 +108,7 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += us
|
||||||
obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o
|
|
||||||
obj-$(CONFIG_PADATA) += padata.o
|
obj-$(CONFIG_PADATA) += padata.o
|
||||||
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
|
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
|
||||||
|
obj-$(CONFIG_JUMP_LABEL) += jump_label.o
|
||||||
+obj-$(CONFIG_CRASHLOG) += crashlog.o
|
+obj-$(CONFIG_CRASHLOG) += crashlog.o
|
||||||
|
|
||||||
ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
|
ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
|
||||||
|
|
|
@ -89,7 +89,7 @@
|
||||||
* We enter with non-exclusive mmap_sem (to exclude vma changes,
|
* We enter with non-exclusive mmap_sem (to exclude vma changes,
|
||||||
--- a/mm/vmalloc.c
|
--- a/mm/vmalloc.c
|
||||||
+++ b/mm/vmalloc.c
|
+++ b/mm/vmalloc.c
|
||||||
@@ -1231,6 +1231,7 @@ void unmap_kernel_range(unsigned long ad
|
@@ -1232,6 +1232,7 @@ void unmap_kernel_range(unsigned long ad
|
||||||
vunmap_page_range(addr, end);
|
vunmap_page_range(addr, end);
|
||||||
flush_tlb_kernel_range(addr, end);
|
flush_tlb_kernel_range(addr, end);
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
|
|
||||||
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
|
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
|
||||||
{
|
{
|
||||||
@@ -1346,6 +1347,7 @@ struct vm_struct *get_vm_area(unsigned l
|
@@ -1347,6 +1348,7 @@ struct vm_struct *get_vm_area(unsigned l
|
||||||
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
|
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
|
||||||
-1, GFP_KERNEL, __builtin_return_address(0));
|
-1, GFP_KERNEL, __builtin_return_address(0));
|
||||||
}
|
}
|
||||||
|
|
|
@ -2818,15 +2818,6 @@
|
||||||
bluecheese MACH_BLUECHEESE BLUECHEESE 3057
|
bluecheese MACH_BLUECHEESE BLUECHEESE 3057
|
||||||
tem3x30 MACH_TEM3X30 TEM3X30 3058
|
tem3x30 MACH_TEM3X30 TEM3X30 3058
|
||||||
harvest_desoto MACH_HARVEST_DESOTO HARVEST_DESOTO 3059
|
harvest_desoto MACH_HARVEST_DESOTO HARVEST_DESOTO 3059
|
||||||
@@ -910,7 +3240,7 @@ omapl138_case_a3 MACH_OMAPL138_CASE_A3 O
|
|
||||||
uemd MACH_UEMD UEMD 3281
|
|
||||||
ccwmx51mut MACH_CCWMX51MUT CCWMX51MUT 3282
|
|
||||||
rockhopper MACH_ROCKHOPPER ROCKHOPPER 3283
|
|
||||||
-nookcolor MACH_NOOKCOLOR NOOKCOLOR 3284
|
|
||||||
+encore MACH_ENCORE ENCORE 3284
|
|
||||||
hkdkc100 MACH_HKDKC100 HKDKC100 3285
|
|
||||||
ts42xx MACH_TS42XX TS42XX 3286
|
|
||||||
aebl MACH_AEBL AEBL 3287
|
|
||||||
@@ -921,7 +3251,9 @@ isc3 MACH_ISC3 ISC3 3291
|
@@ -921,7 +3251,9 @@ isc3 MACH_ISC3 ISC3 3291
|
||||||
rascal MACH_RASCAL RASCAL 3292
|
rascal MACH_RASCAL RASCAL 3292
|
||||||
hrefv60 MACH_HREFV60 HREFV60 3293
|
hrefv60 MACH_HREFV60 HREFV60 3293
|
||||||
|
|
Loading…
Reference in a new issue