mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 04:48:57 +02:00
kernel: refresh patches for kernel 3.0-rc5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27300 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
6936562161
commit
a89d3f1a9b
@ -23,7 +23,7 @@ Date: Thu Dec 16 20:01:17 2010 +0100
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)},
|
||||
--- a/include/linux/pci_ids.h
|
||||
+++ b/include/linux/pci_ids.h
|
||||
@@ -2076,6 +2076,7 @@
|
||||
@@ -2077,6 +2077,7 @@
|
||||
#define PCI_DEVICE_ID_NX2_57711E 0x1650
|
||||
#define PCI_DEVICE_ID_TIGON3_5705 0x1653
|
||||
#define PCI_DEVICE_ID_TIGON3_5705_2 0x1654
|
||||
@ -31,7 +31,7 @@ Date: Thu Dec 16 20:01:17 2010 +0100
|
||||
#define PCI_DEVICE_ID_TIGON3_5721 0x1659
|
||||
#define PCI_DEVICE_ID_TIGON3_5722 0x165a
|
||||
#define PCI_DEVICE_ID_TIGON3_5723 0x165b
|
||||
@@ -2091,11 +2092,13 @@
|
||||
@@ -2092,11 +2093,13 @@
|
||||
#define PCI_DEVICE_ID_TIGON3_5754M 0x1672
|
||||
#define PCI_DEVICE_ID_TIGON3_5755M 0x1673
|
||||
#define PCI_DEVICE_ID_TIGON3_5756 0x1674
|
||||
|
@ -156,7 +156,7 @@
|
||||
{
|
||||
--- a/include/linux/fs.h
|
||||
+++ b/include/linux/fs.h
|
||||
@@ -1602,6 +1602,7 @@ struct inode_operations {
|
||||
@@ -1603,6 +1603,7 @@ struct inode_operations {
|
||||
void (*truncate_range)(struct inode *, loff_t, loff_t);
|
||||
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
|
||||
u64 len);
|
||||
@ -164,7 +164,7 @@
|
||||
} ____cacheline_aligned;
|
||||
|
||||
struct seq_file;
|
||||
@@ -1996,6 +1997,7 @@ extern long do_sys_open(int dfd, const c
|
||||
@@ -1997,6 +1998,7 @@ extern long do_sys_open(int dfd, const c
|
||||
extern struct file *filp_open(const char *, int, int);
|
||||
extern struct file *file_open_root(struct dentry *, struct vfsmount *,
|
||||
const char *, int);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -2944,6 +2944,16 @@ out:
|
||||
@@ -2951,6 +2951,16 @@ out:
|
||||
|
||||
/* 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
|
||||
@@ -3021,10 +3031,7 @@ int shmem_zero_setup(struct vm_area_stru
|
||||
@@ -3028,11 +3038,8 @@ int shmem_zero_setup(struct vm_area_stru
|
||||
if (IS_ERR(file))
|
||||
return PTR_ERR(file);
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--- a/fs/file.c
|
||||
+++ b/fs/file.c
|
||||
@@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi
|
||||
@ -78,8 +79,8 @@
|
||||
|
||||
/**
|
||||
* zap_vma_ptes - remove ptes mapping the vma
|
||||
@@ -2821,6 +2822,7 @@ int vmtruncate_range(struct inode *inode
|
||||
|
||||
@@ -3014,6 +3015,7 @@ static inline int check_stack_guard_page
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(vmtruncate_range);
|
||||
|
@ -4,6 +4,6 @@
|
||||
VERSION = 3
|
||||
PATCHLEVEL = 0
|
||||
-SUBLEVEL = 0
|
||||
EXTRAVERSION = -rc4
|
||||
EXTRAVERSION = -rc5
|
||||
NAME = Sneaky Weasel
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user