From c9a1cb5a8f879c9aa914bf818219609e8cccb0c7 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 28 Jan 2009 15:47:34 +0000 Subject: [kernel] update to 2.6.28.2 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14247 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.28/900-headers_type_and_time.patch | 2 +- .../linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch | 12 ++++++------ .../linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch | 2 +- target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'target/linux/generic-2.6/patches-2.6.28') diff --git a/target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch index 4127cd49f..f21478b08 100644 --- a/target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch +++ b/target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch @@ -11,7 +11,7 @@ #include #ifdef __KERNEL__ -@@ -239,4 +243,6 @@ struct itimerval { +@@ -240,4 +244,6 @@ struct itimerval { */ #define TIMER_ABSTIME 0x01 diff --git a/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch index 94b9e21c2..453affe58 100644 --- a/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch +++ b/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch @@ -1,5 +1,5 @@ ---- ../../cs5535_gpio.c.orig 2009-01-07 10:16:12.000000000 +0100 -+++ linux-2.6.28/drivers/char/cs5535_gpio.c 2009-01-07 10:13:54.000000000 +0100 +--- a/drivers/char/cs5535_gpio.c ++++ b/drivers/char/cs5535_gpio.c @@ -15,6 +15,7 @@ #include #include @@ -8,7 +8,7 @@ #include #include #include -@@ -48,6 +49,7 @@ +@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] MODULE_DEVICE_TABLE(pci, divil_pci); static struct cdev cs5535_gpio_cdev; @@ -16,7 +16,7 @@ /* reserve 32 entries even though some aren't usable */ #define CS5535_GPIO_COUNT 32 -@@ -66,9 +68,14 @@ +@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] = { 0x30, 0x00, '1', '0' }, /* GPIOx_READ_BACK / GPIOx_OUT_VAL */ { 0x20, 0x20, 'I', 'i' }, /* GPIOx_IN_EN */ { 0x04, 0x04, 'O', 'o' }, /* GPIOx_OUT_EN */ @@ -31,7 +31,7 @@ }; -@@ -177,7 +184,7 @@ +@@ -177,7 +184,7 @@ static int __init cs5535_gpio_init(void) { dev_t dev_id; u32 low, hi; @@ -40,7 +40,7 @@ if (pci_dev_present(divil_pci) == 0) { printk(KERN_WARNING NAME ": DIVIL not found\n"); -@@ -232,23 +239,54 @@ +@@ -232,23 +239,54 @@ static int __init cs5535_gpio_init(void) major = MAJOR(dev_id); } diff --git a/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch index f7924c6b1..203266c56 100644 --- a/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch +++ b/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch @@ -88,7 +88,7 @@ /********************************************************************* --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -140,6 +140,7 @@ asmlinkage long sys_dup(unsigned int fil +@@ -140,6 +140,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde } return ret; } diff --git a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch index ad36593a6..e0c7387cf 100644 --- a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch @@ -95,7 +95,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -980,6 +980,7 @@ void unmap_kernel_range(unsigned long ad +@@ -981,6 +981,7 @@ void unmap_kernel_range(unsigned long ad vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -103,7 +103,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1085,6 +1086,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1086,6 +1087,7 @@ struct vm_struct *get_vm_area(unsigned l return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); } -- cgit v1.2.3