From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QFRao-0000PL-5z for garchives@archives.gentoo.org; Thu, 28 Apr 2011 13:51:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 023B6E0458; Thu, 28 Apr 2011 13:49:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9C527E0458 for ; Thu, 28 Apr 2011 13:49:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C52C1BC014 for ; Thu, 28 Apr 2011 13:49:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5985A8040A for ; Thu, 28 Apr 2011 13:49:02 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 2.6.32/, 2.6.38/ X-VCS-Repository: proj/hardened-patchset X-VCS-Files: 2.6.32/0000_README 2.6.32/1038_linux-2.6.32.39.patch 2.6.32/4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch 2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch 2.6.32/4422_grsec-mute-warnings.patch 2.6.38/0000_README 2.6.38/4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch 2.6.38/4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch 2.6.38/4422_grsec-mute-warnings.patch X-VCS-Directories: 2.6.32/ 2.6.38/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: ac2c5915928d32b7b691261cead4f51c7856d572 Date: Thu, 28 Apr 2011 13:49:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c15e5849934ca2bf18b9dde7f51b1acb commit: ac2c5915928d32b7b691261cead4f51c7856d572 Author: Anthony G. Basile gentoo org> AuthorDate: Thu Apr 28 13:48:14 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Thu Apr 28 13:48:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-patc= hset.git;a=3Dcommit;h=3Dac2c5915 Update Grsec/PaX 2.2.2-2.6.32.39-201104232142 2.2.2-2.6.38.4-201104232142.patch --- 2.6.32/0000_README | 6 +- 2.6.32/1038_linux-2.6.32.39.patch | 792 ++ ..._grsecurity-2.2.2-2.6.32.39-201104232142.patch} |10112 ++++++++------= ------ 2.6.32/4422_grsec-mute-warnings.patch | 15 +- 2.6.38/0000_README | 2 +- ...0_grsecurity-2.2.2-2.6.38.4-201104232142.patch} | 9442 +++++++-------= ---- 2.6.38/4422_grsec-mute-warnings.patch | 17 +- 7 files changed, 8384 insertions(+), 12002 deletions(-) diff --git a/2.6.32/0000_README b/2.6.32/0000_README index 70319a3..a39c8e4 100644 --- a/2.6.32/0000_README +++ b/2.6.32/0000_README @@ -11,7 +11,11 @@ Patch: 1037_linux-2.6.32.38.patch From: http://www.kernel.org Desc: Linux 2.6.32.38 =20 -Patch: 4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch +Patch: 1038_linux-2.6.32.39.patch +From: http://www.kernel.org +Desc: Linux 2.6.32.39 + +Patch: 4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity =20 diff --git a/2.6.32/1038_linux-2.6.32.39.patch b/2.6.32/1038_linux-2.6.32= .39.patch new file mode 100644 index 0000000..ef1f643 --- /dev/null +++ b/2.6.32/1038_linux-2.6.32.39.patch @@ -0,0 +1,792 @@ +diff --git a/MAINTAINERS b/MAINTAINERS +index b23a092..ea3302f 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -5010,7 +5010,6 @@ F: arch/alpha/kernel/srm_env.c +=20 + STABLE BRANCH + M: Greg Kroah-Hartman +-M: Chris Wright + L: stable@kernel.org + S: Maintained +=20 +diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c +index 496ac7a..7bfb274 100644 +--- a/arch/ia64/kernel/mca.c ++++ b/arch/ia64/kernel/mca.c +@@ -1850,7 +1850,8 @@ ia64_mca_cpu_init(void *cpu_data) + data =3D mca_bootmem(); + first_time =3D 0; + } else +- data =3D __get_free_pages(GFP_KERNEL, get_order(sz)); ++ data =3D (void *)__get_free_pages(GFP_KERNEL, ++ get_order(sz)); + if (!data) + panic("Could not allocate MCA memory for cpu %d\n", + cpu); +diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_= provider.c +index 35b2a27..3b7ba70 100644 +--- a/arch/ia64/sn/pci/tioca_provider.c ++++ b/arch/ia64/sn/pci/tioca_provider.c +@@ -517,7 +517,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus= _addr, int dir) + * use the GART mapped mode. + */ + static u64 +-tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int d= ma_flags) ++tioca_dma_map(struct pci_dev *pdev, unsigned long paddr, size_t byte_co= unt, int dma_flags) + { + u64 mapaddr; +=20 +diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr= -index.h +index a7e502f..883037b 100644 +--- a/arch/x86/include/asm/msr-index.h ++++ b/arch/x86/include/asm/msr-index.h +@@ -81,11 +81,15 @@ + #define MSR_IA32_MC0_ADDR 0x00000402 + #define MSR_IA32_MC0_MISC 0x00000403 +=20 ++#define MSR_AMD64_MC0_MASK 0xc0010044 ++ + #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) + #define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) + #define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) + #define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) +=20 ++#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) ++ + /* These are consecutive and not in the normal 4er MCE bank block */ + #define MSR_IA32_MC0_CTL2 0x00000280 + #define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) +diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/pro= cessor.h +index 78bb4d7..da35a70 100644 +--- a/arch/x86/include/asm/processor.h ++++ b/arch/x86/include/asm/processor.h +@@ -1029,4 +1029,23 @@ unsigned long calc_aperfmperf_ratio(struct aperfm= perf *old, + return ratio; + } +=20 ++/* ++ * AMD errata checking ++ */ ++#ifdef CONFIG_CPU_SUP_AMD ++extern const int amd_erratum_400[]; ++extern bool cpu_has_amd_erratum(const int *); ++ ++#define AMD_LEGACY_ERRATUM(...) { -1, __VA_ARGS__, 0 } ++#define AMD_OSVW_ERRATUM(osvw_id, ...) { osvw_id, __VA_ARGS__, 0 } ++#define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end) \ ++ ((f << 24) | (m_start << 16) | (s_start << 12) | (m_end << 4) | (s_end= )) ++#define AMD_MODEL_RANGE_FAMILY(range) (((range) >> 24) & 0xff) ++#define AMD_MODEL_RANGE_START(range) (((range) >> 12) & 0xfff) ++#define AMD_MODEL_RANGE_END(range) ((range) & 0xfff) ++ ++#else ++#define cpu_has_amd_erratum(x) (false) ++#endif /* CONFIG_CPU_SUP_AMD */ ++ + #endif /* _ASM_X86_PROCESSOR_H */ +diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c +index 4d707d3..f893f73 100644 +--- a/arch/x86/kernel/cpu/amd.c ++++ b/arch/x86/kernel/cpu/amd.c +@@ -566,6 +566,29 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *= c) + } + } + #endif ++ ++ /* As a rule processors have APIC timer running in deep C states */ ++ if (c->x86 >=3D 0xf && !cpu_has_amd_erratum(amd_erratum_400)) ++ set_cpu_cap(c, X86_FEATURE_ARAT); ++ ++ /* ++ * Disable GART TLB Walk Errors on Fam10h. We do this here ++ * because this is always needed when GART is enabled, even in a ++ * kernel which has no MCE support built in. ++ */ ++ if (c->x86 =3D=3D 0x10) { ++ /* ++ * BIOS should disable GartTlbWlk Errors themself. If ++ * it doesn't do it here as suggested by the BKDG. ++ * ++ * Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=3D33012 ++ */ ++ u64 mask; ++ ++ rdmsrl(MSR_AMD64_MCx_MASK(4), mask); ++ mask |=3D (1 << 10); ++ wrmsrl(MSR_AMD64_MCx_MASK(4), mask); ++ } + } +=20 + #ifdef CONFIG_X86_32 +@@ -610,3 +633,68 @@ static const struct cpu_dev __cpuinitconst amd_cpu_= dev =3D { + }; +=20 + cpu_dev_register(amd_cpu_dev); ++ ++/* ++ * AMD errata checking ++ * ++ * Errata are defined as arrays of ints using the AMD_LEGACY_ERRATUM() = or ++ * AMD_OSVW_ERRATUM() macros. The latter is intended for newer errata t= hat ++ * have an OSVW id assigned, which it takes as first argument. Both tak= e a ++ * variable number of family-specific model-stepping ranges created by ++ * AMD_MODEL_RANGE(). Each erratum also has to be declared as extern co= nst ++ * int[] in arch/x86/include/asm/processor.h. ++ * ++ * Example: ++ * ++ * const int amd_erratum_319[] =3D ++ * AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0x4, 0x2), ++ * AMD_MODEL_RANGE(0x10, 0x8, 0x0, 0x8, 0x0), ++ * AMD_MODEL_RANGE(0x10, 0x9, 0x0, 0x9, 0x0)); ++ */ ++ ++const int amd_erratum_400[] =3D ++ AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf), ++ AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); ++ ++ ++bool cpu_has_amd_erratum(const int *erratum) ++{ ++ struct cpuinfo_x86 *cpu =3D ¤t_cpu_data; ++ int osvw_id =3D *erratum++; ++ u32 range; ++ u32 ms; ++ ++ /* ++ * If called early enough that current_cpu_data hasn't been initialize= d ++ * yet, fall back to boot_cpu_data. ++ */ ++ if (cpu->x86 =3D=3D 0) ++ cpu =3D &boot_cpu_data; ++ ++ if (cpu->x86_vendor !=3D X86_VENDOR_AMD) ++ return false; ++ ++ if (osvw_id >=3D 0 && osvw_id < 65536 && ++ cpu_has(cpu, X86_FEATURE_OSVW)) { ++ u64 osvw_len; ++ ++ rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, osvw_len); ++ if (osvw_id < osvw_len) { ++ u64 osvw_bits; ++ ++ rdmsrl(MSR_AMD64_OSVW_STATUS + (osvw_id >> 6), ++ osvw_bits); ++ return osvw_bits & (1ULL << (osvw_id & 0x3f)); ++ } ++ } ++ ++ /* OSVW unavailable or ID unknown, match family-model-stepping range *= / ++ ms =3D (cpu->x86_model << 4) | cpu->x86_mask; ++ while ((range =3D *erratum++)) ++ if ((cpu->x86 =3D=3D AMD_MODEL_RANGE_FAMILY(range)) && ++ (ms >=3D AMD_MODEL_RANGE_START(range)) && ++ (ms <=3D AMD_MODEL_RANGE_END(range))) ++ return true; ++ ++ return false; ++} +diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c +index 5fd5b07..fc6c84d 100644 +--- a/arch/x86/kernel/process.c ++++ b/arch/x86/kernel/process.c +@@ -438,42 +438,6 @@ static int __cpuinit mwait_usable(const struct cpui= nfo_x86 *c) + return (edx & MWAIT_EDX_C1); + } +=20 +-/* +- * Check for AMD CPUs, where APIC timer interrupt does not wake up CPU = from C1e. +- * For more information see +- * - Erratum #400 for NPT family 0xf and family 0x10 CPUs +- * - Erratum #365 for family 0x11 (not affected because C1e not in use) +- */ +-static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c) +-{ +- u64 val; +- if (c->x86_vendor !=3D X86_VENDOR_AMD) +- goto no_c1e_idle; +- +- /* Family 0x0f models < rev F do not have C1E */ +- if (c->x86 =3D=3D 0x0F && c->x86_model >=3D 0x40) +- return 1; +- +- if (c->x86 =3D=3D 0x10) { +- /* +- * check OSVW bit for CPUs that are not affected +- * by erratum #400 +- */ +- if (cpu_has(c, X86_FEATURE_OSVW)) { +- rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, val); +- if (val >=3D 2) { +- rdmsrl(MSR_AMD64_OSVW_STATUS, val); +- if (!(val & BIT(1))) +- goto no_c1e_idle; +- } +- } +- return 1; +- } +- +-no_c1e_idle: +- return 0; +-} +- + static cpumask_var_t c1e_mask; + static int c1e_detected; +=20 +@@ -551,7 +515,8 @@ void __cpuinit select_idle_routine(const struct cpui= nfo_x86 *c) + */ + printk(KERN_INFO "using mwait in idle threads.\n"); + pm_idle =3D mwait_idle; +- } else if (check_c1e_idle(c)) { ++ } else if (cpu_has_amd_erratum(amd_erratum_400)) { ++ /* E400: APIC timer interrupt does not wake up CPU from C1e */ + printk(KERN_INFO "using C1E aware idle routine\n"); + pm_idle =3D c1e_idle; + } else +diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S +index 648fe47..f35eec7 100644 +--- a/arch/x86/lib/semaphore_32.S ++++ b/arch/x86/lib/semaphore_32.S +@@ -36,7 +36,7 @@ + */ + #ifdef CONFIG_SMP + ENTRY(__write_lock_failed) +- CFI_STARTPROC simple ++ CFI_STARTPROC + FRAME + 2: LOCK_PREFIX + addl $ RW_LOCK_BIAS,(%eax) +diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/= video/sn9c102/sn9c102_core.c +index 4a7711c..5844abf 100644 +--- a/drivers/media/video/sn9c102/sn9c102_core.c ++++ b/drivers/media/video/sn9c102/sn9c102_core.c +@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR, + sn9c102_show_i2c_reg, sn9c102_store_i2c_reg); + static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR, + sn9c102_show_i2c_val, sn9c102_store_i2c_val); +-static DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green); +-static DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue); +-static DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red); ++static DEVICE_ATTR(green, S_IWUSR, NULL, sn9c102_store_green); ++static DEVICE_ATTR(blue, S_IWUSR, NULL, sn9c102_store_blue); ++static DEVICE_ATTR(red, S_IWUSR, NULL, sn9c102_store_red); + static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NU= LL); +=20 +=20 +diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c +index 33d5c57..605caaa 100644 +--- a/drivers/net/usb/cdc-phonet.c ++++ b/drivers/net/usb/cdc-phonet.c +@@ -325,13 +325,13 @@ int usbpn_probe(struct usb_interface *intf, const = struct usb_device_id *id) + { + static const char ifname[] =3D "usbpn%d"; + const struct usb_cdc_union_desc *union_header =3D NULL; +- const struct usb_cdc_header_desc *phonet_header =3D NULL; + const struct usb_host_interface *data_desc; + struct usb_interface *data_intf; + struct usb_device *usbdev =3D interface_to_usbdev(intf); + struct net_device *dev; + struct usbpn_dev *pnd; + u8 *data; ++ int phonet =3D 0; + int len, err; +=20 + data =3D intf->altsetting->extra; +@@ -352,10 +352,7 @@ int usbpn_probe(struct usb_interface *intf, const s= truct usb_device_id *id) + (struct usb_cdc_union_desc *)data; + break; + case 0xAB: +- if (phonet_header || dlen < 5) +- break; +- phonet_header =3D +- (struct usb_cdc_header_desc *)data; ++ phonet =3D 1; + break; + } + } +@@ -363,7 +360,7 @@ int usbpn_probe(struct usb_interface *intf, const st= ruct usb_device_id *id) + len -=3D dlen; + } +=20 +- if (!union_header || !phonet_header) ++ if (!union_header || !phonet) + return -EINVAL; +=20 + data_intf =3D usb_ifnum_to_if(usbdev, union_header->bSlaveInterface0); +diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c +index 355dffc..2ce5963 100644 +--- a/drivers/usb/core/devices.c ++++ b/drivers/usb/core/devices.c +@@ -211,7 +211,7 @@ static char *usb_dump_endpoint_descriptor(int speed,= char *start, char *end, + break; + case USB_ENDPOINT_XFER_INT: + type =3D "Int."; +- if (speed =3D=3D USB_SPEED_HIGH) ++ if (speed =3D=3D USB_SPEED_HIGH || speed =3D=3D USB_SPEED_SUPER) + interval =3D 1 << (desc->bInterval - 1); + else + interval =3D desc->bInterval; +@@ -219,7 +219,8 @@ static char *usb_dump_endpoint_descriptor(int speed,= char *start, char *end, + default: /* "can't happen" */ + return start; + } +- interval *=3D (speed =3D=3D USB_SPEED_HIGH) ? 125 : 1000; ++ interval *=3D (speed =3D=3D USB_SPEED_HIGH || ++ speed =3D=3D USB_SPEED_SUPER) ? 125 : 1000; + if (interval % 1000) + unit =3D 'u'; + else { +@@ -529,8 +530,9 @@ static ssize_t usb_device_dump(char __user **buffer,= size_t *nbytes, + if (level =3D=3D 0) { + int max; +=20 +- /* high speed reserves 80%, full/low reserves 90% */ +- if (usbdev->speed =3D=3D USB_SPEED_HIGH) ++ /* super/high speed reserves 80%, full/low reserves 90% */ ++ if (usbdev->speed =3D=3D USB_SPEED_HIGH || ++ usbdev->speed =3D=3D USB_SPEED_SUPER) + max =3D 800; + else + max =3D FRAME_TIME_MAX_USECS_ALLOC; +diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c +index d4bd6ef..f51345f 100644 +--- a/drivers/usb/host/ehci-q.c ++++ b/drivers/usb/host/ehci-q.c +@@ -1224,24 +1224,27 @@ static void start_unlink_async (struct ehci_hcd = *ehci, struct ehci_qh *qh) +=20 + static void scan_async (struct ehci_hcd *ehci) + { ++ bool stopped; + struct ehci_qh *qh; + enum ehci_timer_action action =3D TIMER_IO_WATCHDOG; +=20 + ehci->stamp =3D ehci_readl(ehci, &ehci->regs->frame_index); + timer_action_done (ehci, TIMER_ASYNC_SHRINK); + rescan: ++ stopped =3D !HC_IS_RUNNING(ehci_to_hcd(ehci)->state); + qh =3D ehci->async->qh_next.qh; + if (likely (qh !=3D NULL)) { + do { + /* clean any finished work for this qh */ +- if (!list_empty (&qh->qtd_list) +- && qh->stamp !=3D ehci->stamp) { ++ if (!list_empty(&qh->qtd_list) && (stopped || ++ qh->stamp !=3D ehci->stamp)) { + int temp; +=20 + /* unlinks could happen here; completion + * reporting drops the lock. rescan using + * the latest schedule, but don't rescan +- * qhs we already finished (no looping). ++ * qhs we already finished (no looping) ++ * unless the controller is stopped. + */ + qh =3D qh_get (qh); + qh->stamp =3D ehci->stamp; +@@ -1262,9 +1265,9 @@ rescan: + */ + if (list_empty(&qh->qtd_list) + && qh->qh_state =3D=3D QH_STATE_LINKED) { +- if (!ehci->reclaim +- && ((ehci->stamp - qh->stamp) & 0x1fff) +- >=3D (EHCI_SHRINK_FRAMES * 8)) ++ if (!ehci->reclaim && (stopped || ++ ((ehci->stamp - qh->stamp) & 0x1fff) ++ >=3D EHCI_SHRINK_FRAMES * 8)) + start_unlink_async(ehci, qh); + else + action =3D TIMER_ASYNC_SHRINK; +diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c +index dd71f02..64cb409 100644 +--- a/drivers/usb/host/xhci-mem.c ++++ b/drivers/usb/host/xhci-mem.c +@@ -439,6 +439,47 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd= *xhci, struct usb_device *ud + return 0; + } +=20 ++/* ++ * Convert interval expressed as 2^(bInterval - 1) =3D=3D interval into ++ * straight exponent value 2^n =3D=3D interval. ++ * ++ */ ++static unsigned int xhci_parse_exponent_interval(struct usb_device *ude= v, ++ struct usb_host_endpoint *ep) ++{ ++ unsigned int interval; ++ ++ interval =3D clamp_val(ep->desc.bInterval, 1, 16) - 1; ++ if (interval !=3D ep->desc.bInterval - 1) ++ dev_warn(&udev->dev, ++ "ep %#x - rounding interval to %d microframes\n", ++ ep->desc.bEndpointAddress, ++ 1 << interval); ++ ++ return interval; ++} ++ ++/* ++ * Convert bInterval expressed in frames (in 1-255 range) to exponent o= f ++ * microframes, rounded down to nearest power of 2. ++ */ ++static unsigned int xhci_parse_frame_interval(struct usb_device *udev, ++ struct usb_host_endpoint *ep) ++{ ++ unsigned int interval; ++ ++ interval =3D fls(8 * ep->desc.bInterval) - 1; ++ interval =3D clamp_val(interval, 3, 10); ++ if ((1 << interval) !=3D 8 * ep->desc.bInterval) ++ dev_warn(&udev->dev, ++ "ep %#x - rounding interval to %d microframes, ep desc says %d micr= oframes\n", ++ ep->desc.bEndpointAddress, ++ 1 << interval, ++ 8 * ep->desc.bInterval); ++ ++ return interval; ++} ++ + /* Return the polling or NAK interval. + * + * The polling interval is expressed in "microframes". If xHCI's Inter= val field +@@ -456,40 +497,38 @@ static inline unsigned int xhci_get_endpoint_inter= val(struct usb_device *udev, + case USB_SPEED_HIGH: + /* Max NAK rate */ + if (usb_endpoint_xfer_control(&ep->desc) || +- usb_endpoint_xfer_bulk(&ep->desc)) ++ usb_endpoint_xfer_bulk(&ep->desc)) { + interval =3D ep->desc.bInterval; ++ break; ++ } + /* Fall through - SS and HS isoc/int have same decoding */ ++ + case USB_SPEED_SUPER: + if (usb_endpoint_xfer_int(&ep->desc) || +- usb_endpoint_xfer_isoc(&ep->desc)) { +- if (ep->desc.bInterval =3D=3D 0) +- interval =3D 0; +- else +- interval =3D ep->desc.bInterval - 1; +- if (interval > 15) +- interval =3D 15; +- if (interval !=3D ep->desc.bInterval + 1) +- dev_warn(&udev->dev, "ep %#x - rounding interval to %d microframes\= n", +- ep->desc.bEndpointAddress, 1 << interval); ++ usb_endpoint_xfer_isoc(&ep->desc)) { ++ interval =3D xhci_parse_exponent_interval(udev, ep); + } + break; +- /* Convert bInterval (in 1-255 frames) to microframes and round down t= o +- * nearest power of 2. +- */ ++ + case USB_SPEED_FULL: ++ if (usb_endpoint_xfer_int(&ep->desc)) { ++ interval =3D xhci_parse_exponent_interval(udev, ep); ++ break; ++ } ++ /* ++ * Fall through for isochronous endpoint interval decoding ++ * since it uses the same rules as low speed interrupt ++ * endpoints. ++ */ ++ + case USB_SPEED_LOW: + if (usb_endpoint_xfer_int(&ep->desc) || +- usb_endpoint_xfer_isoc(&ep->desc)) { +- interval =3D fls(8*ep->desc.bInterval) - 1; +- if (interval > 10) +- interval =3D 10; +- if (interval < 3) +- interval =3D 3; +- if ((1 << interval) !=3D 8*ep->desc.bInterval) +- dev_warn(&udev->dev, "ep %#x - rounding interval to %d microframes\= n", +- ep->desc.bEndpointAddress, 1 << interval); ++ usb_endpoint_xfer_isoc(&ep->desc)) { ++ ++ interval =3D xhci_parse_frame_interval(udev, ep); + } + break; ++ + default: + BUG(); + } +diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h +index db821e9..a5dc8086 100644 +--- a/drivers/usb/host/xhci.h ++++ b/drivers/usb/host/xhci.h +@@ -232,7 +232,7 @@ struct xhci_op_regs { + * notification type that matches a bit set in this bit field. + */ + #define DEV_NOTE_MASK (0xffff) +-#define ENABLE_DEV_NOTE(x) (1 << x) ++#define ENABLE_DEV_NOTE(x) (1 << (x)) + /* Most of the device notification types should only be used for debug. + * SW does need to pay attention to function wake notifications. + */ +@@ -579,11 +579,11 @@ struct xhci_ep_ctx { + #define EP_STATE_STOPPED 3 + #define EP_STATE_ERROR 4 + /* Mult - Max number of burtst within an interval, in EP companion desc= . */ +-#define EP_MULT(p) ((p & 0x3) << 8) ++#define EP_MULT(p) (((p) & 0x3) << 8) + /* bits 10:14 are Max Primary Streams */ + /* bit 15 is Linear Stream Array */ + /* Interval - period between requests to an endpoint - 125u increments.= */ +-#define EP_INTERVAL(p) ((p & 0xff) << 16) ++#define EP_INTERVAL(p) (((p) & 0xff) << 16) + #define EP_INTERVAL_TO_UFRAMES(p) (1 << (((p) >> 16) & 0xff)) +=20 + /* ep_info2 bitmasks */ +diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio= .c +index e371888..5171f22 100644 +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -155,6 +155,8 @@ static struct ftdi_sio_quirk ftdi_stmclite_quirk =3D= { + * /sys/bus/usb/ftdi_sio/new_id, then send patch/report! + */ + static struct usb_device_id id_table_combined [] =3D { ++ { USB_DEVICE(FTDI_VID, FTDI_CTI_MINI_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CTI_NANO_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) }, +@@ -529,6 +531,7 @@ static struct usb_device_id id_table_combined [] =3D= { + { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2803_8_PID) }, + { USB_DEVICE(IDTECH_VID, IDTECH_IDT1221U_PID) }, + { USB_DEVICE(OCT_VID, OCT_US101_PID) }, ++ { USB_DEVICE(OCT_VID, OCT_DK201_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_HE_TIRA1_PID), + .driver_info =3D (kernel_ulong_t)&ftdi_HE_TIRA1_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_USB_UIRT_PID), +@@ -790,6 +793,8 @@ static struct usb_device_id id_table_combined [] =3D= { + { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), + .driver_info =3D (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) }, ++ { USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) }, ++ { USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) }, + { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) }, + { USB_DEVICE(FTDI_VID, MJSG_GENERIC_PID) }, + { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) }, +diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi= _sio_ids.h +index c8d0fec..eca754b 100644 +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -300,6 +300,8 @@ + * Hameg HO820 and HO870 interface (using VID 0x0403) + */ + #define HAMEG_HO820_PID 0xed74 ++#define HAMEG_HO730_PID 0xed73 ++#define HAMEG_HO720_PID 0xed72 + #define HAMEG_HO870_PID 0xed71 +=20 + /* +@@ -579,6 +581,7 @@ + /* Note: OCT US101 is also rebadged as Dick Smith Electronics (NZ) XH63= 81 */ + /* Also rebadged as Dick Smith Electronics (Aus) XH6451 */ + /* Also rebadged as SIIG Inc. model US2308 hardware version 1 */ ++#define OCT_DK201_PID 0x0103 /* OCT DK201 USB docking station */ + #define OCT_US101_PID 0x0421 /* OCT US101 USB to RS-232 */ +=20 + /* +@@ -1147,3 +1150,12 @@ + #define QIHARDWARE_VID 0x20B7 + #define MILKYMISTONE_JTAGSERIAL_PID 0x0713 +=20 ++/* ++ * CTI GmbH RS485 Converter http://www.cti-lean.com/ ++ */ ++/* USB-485-Mini*/ ++#define FTDI_CTI_MINI_PID 0xF608 ++/* USB-Nano-485*/ ++#define FTDI_CTI_NANO_PID 0xF60B ++ ++ +diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c +index cf5ff7d..e605c89 100644 +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -388,6 +388,16 @@ static int option_resume(struct usb_serial *serial= ); + #define CELOT_VENDOR_ID 0x211f + #define CELOT_PRODUCT_CT680M 0x6801 +=20 ++/* ONDA Communication vendor id */ ++#define ONDA_VENDOR_ID 0x1ee8 ++ ++/* ONDA MT825UP HSDPA 14.2 modem */ ++#define ONDA_MT825UP 0x000b ++ ++/* Samsung products */ ++#define SAMSUNG_VENDOR_ID 0x04e8 ++#define SAMSUNG_PRODUCT_GT_B3730 0x6889 ++ + static struct usb_device_id option_ids[] =3D { + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, +@@ -917,6 +927,8 @@ static struct usb_device_id option_ids[] =3D { +=20 + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, + { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA = 450 1xEVDO modem */ ++ { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */ ++ { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_= B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730/GT-B3710 LT= E USB modem.*/ + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); +diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c +index 3bbcaa7..7df5937 100644 +--- a/fs/cifs/connect.c ++++ b/fs/cifs/connect.c +@@ -2532,7 +2532,7 @@ try_mount_again: +=20 + remote_path_check: + /* check if a whole path (including prepath) is not remote */ +- if (!rc && cifs_sb->prepathlen && tcon) { ++ if (!rc && tcon) { + /* build_path_to_root works only when we have a valid tcon */ + full_path =3D cifs_build_path_to_root(cifs_sb); + if (full_path =3D=3D NULL) { +diff --git a/fs/proc/base.c b/fs/proc/base.c +index a1bb0f6..3d09a10 100644 +--- a/fs/proc/base.c ++++ b/fs/proc/base.c +@@ -2806,11 +2806,16 @@ static int proc_pid_fill_cache(struct file *filp= , void *dirent, filldir_t filldi + /* for the /proc/ directory itself, after non-process stuff has been do= ne */ + int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filld= ir) + { +- unsigned int nr =3D filp->f_pos - FIRST_PROCESS_ENTRY; +- struct task_struct *reaper =3D get_proc_task(filp->f_path.dentry->d_in= ode); ++ unsigned int nr; ++ struct task_struct *reaper; + struct tgid_iter iter; + struct pid_namespace *ns; +=20 ++ if (filp->f_pos >=3D PID_MAX_LIMIT + TGID_OFFSET) ++ goto out_no_task; ++ nr =3D filp->f_pos - FIRST_PROCESS_ENTRY; ++ ++ reaper =3D get_proc_task(filp->f_path.dentry->d_inode); + if (!reaper) + goto out_no_task; +=20 +diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c +index 32fae40..3c420b2 100644 +--- a/fs/ramfs/file-nommu.c ++++ b/fs/ramfs/file-nommu.c +@@ -111,6 +111,7 @@ int ramfs_nommu_expand_for_mapping(struct inode *ino= de, size_t newsize) + SetPageDirty(page); +=20 + unlock_page(page); ++ put_page(page); + } +=20 + return 0; +diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c +index ace4d8d..ceaa1d3 100644 +--- a/fs/ubifs/debug.c ++++ b/fs/ubifs/debug.c +@@ -2691,19 +2691,19 @@ int dbg_debugfs_init_fs(struct ubifs_info *c) + } +=20 + fname =3D "dump_lprops"; +- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; ++ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; + if (IS_ERR(dent)) + goto out_remove; + d->dfs_dump_lprops =3D dent; +=20 + fname =3D "dump_budg"; +- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; ++ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; + if (IS_ERR(dent)) + goto out_remove; + d->dfs_dump_budg =3D dent; +=20 + fname =3D "dump_tnc"; +- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; ++ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; + if (IS_ERR(dent)) + goto out_remove; + d->dfs_dump_tnc =3D dent; +diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c +index 1009adc..e90dd7e 100644 +--- a/fs/ubifs/file.c ++++ b/fs/ubifs/file.c +@@ -1311,6 +1311,9 @@ int ubifs_fsync(struct file *file, struct dentry *= dentry, int datasync) +=20 + dbg_gen("syncing inode %lu", inode->i_ino); +=20 ++ if (inode->i_sb->s_flags & MS_RDONLY) ++ return 0; ++ + /* + * VFS has already synchronized dirty pages for this inode. Synchroniz= e + * the inode unless this is a 'datasync()' call. +diff --git a/include/linux/pid.h b/include/linux/pid.h +index 49f1c2f..ec9f2df 100644 +--- a/include/linux/pid.h ++++ b/include/linux/pid.h +@@ -117,7 +117,7 @@ extern struct pid *find_vpid(int nr); + */ + extern struct pid *find_get_pid(int nr); + extern struct pid *find_ge_pid(int nr, struct pid_namespace *); +-int next_pidmap(struct pid_namespace *pid_ns, int last); ++int next_pidmap(struct pid_namespace *pid_ns, unsigned int last); +=20 + extern struct pid *alloc_pid(struct pid_namespace *ns); + extern void free_pid(struct pid *pid); +diff --git a/kernel/pid.c b/kernel/pid.c +index d3f722d..fce7198 100644 +--- a/kernel/pid.c ++++ b/kernel/pid.c +@@ -182,11 +182,14 @@ static int alloc_pidmap(struct pid_namespace *pid_= ns) + return -1; + } +=20 +-int next_pidmap(struct pid_namespace *pid_ns, int last) ++int next_pidmap(struct pid_namespace *pid_ns, unsigned int last) + { + int offset; + struct pidmap *map, *end; +=20 ++ if (last >=3D PID_MAX_LIMIT) ++ return -1; ++ + offset =3D (last + 1) & BITS_PER_PAGE_MASK; + map =3D &pid_ns->pidmap[(last + 1)/BITS_PER_PAGE]; + end =3D &pid_ns->pidmap[PIDMAP_ENTRIES]; +diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c +index 608a97b..1e9f3e42 100644 +--- a/net/ax25/af_ax25.c ++++ b/net/ax25/af_ax25.c +@@ -1391,7 +1391,7 @@ static int ax25_getname(struct socket *sock, struc= t sockaddr *uaddr, + ax25_cb *ax25; + int err =3D 0; +=20 +- memset(fsa, 0, sizeof(fsa)); ++ memset(fsa, 0, sizeof(*fsa)); + lock_sock(sk); + ax25 =3D ax25_sk(sk); +=20 +diff --git a/net/rds/rdma.c b/net/rds/rdma.c +index 6b09b94..ff5e3c9 100644 +--- a/net/rds/rdma.c ++++ b/net/rds/rdma.c +@@ -473,6 +473,17 @@ static struct rds_rdma_op *rds_rdma_prepare(struct = rds_sock *rs, +=20 + max_pages =3D max(nr, max_pages); + nr_pages +=3D nr; ++ ++ /* ++ * nr for one entry in limited to (UINT_MAX>>PAGE_SHIFT)+1 ++ * so nr_pages cannot overflow without becoming bigger than ++ * INT_MAX first. If nr cannot overflow then max_pages should ++ * be ok. ++ */ ++ if (nr_pages > INT_MAX) { ++ ret =3D -EINVAL; ++ goto out; ++ } + } +=20 + pages =3D kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL); diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch b/= 2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch similarity index 83% rename from 2.6.32/4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch rename to 2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch index a2fb0ed..b39bf4e 100644 --- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch +++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.32.38/arch/alpha/include/asm/elf.h linux-2.6.32.38/= arch/alpha/include/asm/elf.h ---- linux-2.6.32.38/arch/alpha/include/asm/elf.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/alpha/include/asm/elf.h 2011-04-17 15:56:45.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/alpha/include/asm/elf.h linux-2.6.32.39/= arch/alpha/include/asm/elf.h +--- linux-2.6.32.39/arch/alpha/include/asm/elf.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/alpha/include/asm/elf.h 2011-04-17 15:56:45.000= 000000 -0400 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/include/asm/elf.h= linux-2.6.32.38/arch/alp /* $0 is set by ld.so to a pointer to a function which might be=20 registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.32.38/arch/alpha/include/asm/pgtable.h linux-2.6.32= .38/arch/alpha/include/asm/pgtable.h ---- linux-2.6.32.38/arch/alpha/include/asm/pgtable.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/alpha/include/asm/pgtable.h 2011-04-17 15:56:45= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/alpha/include/asm/pgtable.h linux-2.6.32= .39/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32.39/arch/alpha/include/asm/pgtable.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/alpha/include/asm/pgtable.h 2011-04-17 15:56:45= .000000000 -0400 @@ -101,6 +101,17 @@ struct vm_area_struct; #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) @@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/include/asm/pgtab= le.h linux-2.6.32.38/arch #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAG= E_KWE) =20 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.32.38/arch/alpha/kernel/module.c linux-2.6.32.38/ar= ch/alpha/kernel/module.c ---- linux-2.6.32.38/arch/alpha/kernel/module.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/alpha/kernel/module.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/alpha/kernel/module.c linux-2.6.32.39/ar= ch/alpha/kernel/module.c +--- linux-2.6.32.39/arch/alpha/kernel/module.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/alpha/kernel/module.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,=20 =20 /* The small sections were sorted to the end of the segment. @@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/kernel/module.c l= inux-2.6.32.38/arch/alpha got =3D sechdrs[me->arch.gotsecindex].sh_addr; =20 for (i =3D 0; i < n; i++) { -diff -urNp linux-2.6.32.38/arch/alpha/kernel/osf_sys.c linux-2.6.32.38/a= rch/alpha/kernel/osf_sys.c ---- linux-2.6.32.38/arch/alpha/kernel/osf_sys.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/alpha/kernel/osf_sys.c 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/alpha/kernel/osf_sys.c linux-2.6.32.39/a= rch/alpha/kernel/osf_sys.c +--- linux-2.6.32.39/arch/alpha/kernel/osf_sys.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/alpha/kernel/osf_sys.c 2011-04-17 15:56:45.0000= 00000 -0400 @@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) @@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/kernel/osf_sys.c = linux-2.6.32.38/arch/alph if (addr !=3D (unsigned long) -ENOMEM) return addr; =20 -diff -urNp linux-2.6.32.38/arch/alpha/mm/fault.c linux-2.6.32.38/arch/al= pha/mm/fault.c ---- linux-2.6.32.38/arch/alpha/mm/fault.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/alpha/mm/fault.c 2011-04-17 15:56:45.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/alpha/mm/fault.c linux-2.6.32.39/arch/al= pha/mm/fault.c +--- linux-2.6.32.39/arch/alpha/mm/fault.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/alpha/mm/fault.c 2011-04-17 15:56:45.000000000 = -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/mm/fault.c linu= x-2.6.32.38/arch/alpha/mm/f } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.32.38/arch/arm/include/asm/elf.h linux-2.6.32.38/ar= ch/arm/include/asm/elf.h ---- linux-2.6.32.38/arch/arm/include/asm/elf.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/arm/include/asm/elf.h 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/arm/include/asm/elf.h linux-2.6.32.39/ar= ch/arm/include/asm/elf.h +--- linux-2.6.32.39/arch/arm/include/asm/elf.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/arm/include/asm/elf.h 2011-04-17 15:56:45.00000= 0000 -0400 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.38/arch/arm/include/asm/elf.h= linux-2.6.32.38/arch/arm/i =20 /* When the program starts, a1 contains a pointer to a function to be=20 registered with atexit, as per the SVR4 ABI. A value of 0 means we=20 -diff -urNp linux-2.6.32.38/arch/arm/include/asm/kmap_types.h linux-2.6.3= 2.38/arch/arm/include/asm/kmap_types.h ---- linux-2.6.32.38/arch/arm/include/asm/kmap_types.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/arm/include/asm/kmap_types.h 2011-04-17 15:56:4= 5.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/arm/include/asm/kmap_types.h linux-2.6.3= 2.39/arch/arm/include/asm/kmap_types.h +--- linux-2.6.32.39/arch/arm/include/asm/kmap_types.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/arm/include/asm/kmap_types.h 2011-04-17 15:56:4= 5.000000000 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.38/arch/arm/include/asm/kmap_= types.h linux-2.6.32.38/arc KM_TYPE_NR }; =20 -diff -urNp linux-2.6.32.38/arch/arm/include/asm/uaccess.h linux-2.6.32.3= 8/arch/arm/include/asm/uaccess.h ---- linux-2.6.32.38/arch/arm/include/asm/uaccess.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/arm/include/asm/uaccess.h 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/arm/include/asm/uaccess.h linux-2.6.32.3= 9/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.39/arch/arm/include/asm/uaccess.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/arm/include/asm/uaccess.h 2011-04-17 15:56:45.0= 00000000 -0400 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn =20 static inline unsigned long __must_check copy_from_user(void *to, const= void __user *from, unsigned long n) @@ -294,9 +294,9 @@ diff -urNp linux-2.6.32.38/arch/arm/include/asm/uacce= ss.h linux-2.6.32.38/arch/a if (access_ok(VERIFY_WRITE, to, n)) n =3D __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.32.38/arch/arm/kernel/kgdb.c linux-2.6.32.38/arch/a= rm/kernel/kgdb.c ---- linux-2.6.32.38/arch/arm/kernel/kgdb.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/arm/kernel/kgdb.c 2011-04-17 15:56:45.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/arm/kernel/kgdb.c linux-2.6.32.39/arch/a= rm/kernel/kgdb.c +--- linux-2.6.32.39/arch/arm/kernel/kgdb.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/arm/kernel/kgdb.c 2011-04-17 15:56:45.000000000= -0400 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -306,9 +306,9 @@ diff -urNp linux-2.6.32.38/arch/arm/kernel/kgdb.c lin= ux-2.6.32.38/arch/arm/kerne #ifndef __ARMEB__ .gdb_bpt_instr =3D {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.32.38/arch/arm/mach-at91/pm.c linux-2.6.32.38/arch/= arm/mach-at91/pm.c ---- linux-2.6.32.38/arch/arm/mach-at91/pm.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/arm/mach-at91/pm.c 2011-04-17 15:56:45.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/arm/mach-at91/pm.c linux-2.6.32.39/arch/= arm/mach-at91/pm.c +--- linux-2.6.32.39/arch/arm/mach-at91/pm.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/arm/mach-at91/pm.c 2011-04-17 15:56:45.00000000= 0 -0400 @@ -348,7 +348,7 @@ static void at91_pm_end(void) } =20 @@ -318,9 +318,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-at91/pm.c li= nux-2.6.32.38/arch/arm/mach .valid =3D at91_pm_valid_state, .begin =3D at91_pm_begin, .enter =3D at91_pm_enter, -diff -urNp linux-2.6.32.38/arch/arm/mach-omap1/pm.c linux-2.6.32.38/arch= /arm/mach-omap1/pm.c ---- linux-2.6.32.38/arch/arm/mach-omap1/pm.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/arm/mach-omap1/pm.c 2011-04-17 15:56:45.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/arm/mach-omap1/pm.c linux-2.6.32.39/arch= /arm/mach-omap1/pm.c +--- linux-2.6.32.39/arch/arm/mach-omap1/pm.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/arm/mach-omap1/pm.c 2011-04-17 15:56:45.0000000= 00 -0400 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq=20 =20 =20 @@ -330,9 +330,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-omap1/pm.c l= inux-2.6.32.38/arch/arm/mac .prepare =3D omap_pm_prepare, .enter =3D omap_pm_enter, .finish =3D omap_pm_finish, -diff -urNp linux-2.6.32.38/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.38/= arch/arm/mach-omap2/pm24xx.c ---- linux-2.6.32.38/arch/arm/mach-omap2/pm24xx.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/arm/mach-omap2/pm24xx.c 2011-04-17 15:56:45.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.39/= arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c 2011-04-17 15:56:45.000= 000000 -0400 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) enable_hlt(); } @@ -342,9 +342,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-omap2/pm24xx= .c linux-2.6.32.38/arch/arm .prepare =3D omap2_pm_prepare, .enter =3D omap2_pm_enter, .finish =3D omap2_pm_finish, -diff -urNp linux-2.6.32.38/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.38/= arch/arm/mach-omap2/pm34xx.c ---- linux-2.6.32.38/arch/arm/mach-omap2/pm34xx.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/arm/mach-omap2/pm34xx.c 2011-04-17 15:56:45.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.39/= arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c 2011-04-17 15:56:45.000= 000000 -0400 @@ -401,7 +401,7 @@ static void omap3_pm_end(void) return; } @@ -354,9 +354,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-omap2/pm34xx= .c linux-2.6.32.38/arch/arm .begin =3D omap3_pm_begin, .end =3D omap3_pm_end, .prepare =3D omap3_pm_prepare, -diff -urNp linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c linux-2.6.32.38/ar= ch/arm/mach-pnx4008/pm.c ---- linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c linux-2.6.32.39/ar= ch/arm/mach-pnx4008/pm.c +--- linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat (state =3D=3D PM_SUSPEND_MEM); } @@ -366,9 +366,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c= linux-2.6.32.38/arch/arm/m .enter =3D pnx4008_pm_enter, .valid =3D pnx4008_pm_valid, }; -diff -urNp linux-2.6.32.38/arch/arm/mach-pxa/pm.c linux-2.6.32.38/arch/a= rm/mach-pxa/pm.c ---- linux-2.6.32.38/arch/arm/mach-pxa/pm.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/arm/mach-pxa/pm.c 2011-04-17 15:56:45.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/arm/mach-pxa/pm.c linux-2.6.32.39/arch/a= rm/mach-pxa/pm.c +--- linux-2.6.32.39/arch/arm/mach-pxa/pm.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/arm/mach-pxa/pm.c 2011-04-17 15:56:45.000000000= -0400 @@ -95,7 +95,7 @@ void pxa_pm_finish(void) pxa_cpu_pm_fns->finish(); } @@ -378,9 +378,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-pxa/pm.c lin= ux-2.6.32.38/arch/arm/mach- .valid =3D pxa_pm_valid, .enter =3D pxa_pm_enter, .prepare =3D pxa_pm_prepare, -diff -urNp linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.3= 8/arch/arm/mach-pxa/sharpsl_pm.c ---- linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_pm.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_pm.c 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.3= 9/arch/arm/mach-pxa/sharpsl_pm.c +--- linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c 2011-04-17 15:56:45.0= 00000000 -0400 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status } =20 @@ -390,9 +390,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_= pm.c linux-2.6.32.38/arch/a .prepare =3D pxa_pm_prepare, .finish =3D pxa_pm_finish, .enter =3D corgi_pxa_pm_enter, -diff -urNp linux-2.6.32.38/arch/arm/mach-sa1100/pm.c linux-2.6.32.38/arc= h/arm/mach-sa1100/pm.c ---- linux-2.6.32.38/arch/arm/mach-sa1100/pm.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/arm/mach-sa1100/pm.c 2011-04-17 15:56:45.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/arm/mach-sa1100/pm.c linux-2.6.32.39/arc= h/arm/mach-sa1100/pm.c +--- linux-2.6.32.39/arch/arm/mach-sa1100/pm.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/arm/mach-sa1100/pm.c 2011-04-17 15:56:45.000000= 000 -0400 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } @@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-sa1100/pm.c = linux-2.6.32.38/arch/arm/ma .enter =3D sa11x0_pm_enter, .valid =3D suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.38/arch/arm/mm/fault.c linux-2.6.32.38/arch/arm/= mm/fault.c ---- linux-2.6.32.38/arch/arm/mm/fault.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/arch/arm/mm/fault.c 2011-04-17 15:56:45.000000000 -0= 400 +diff -urNp linux-2.6.32.39/arch/arm/mm/fault.c linux-2.6.32.39/arch/arm/= mm/fault.c +--- linux-2.6.32.39/arch/arm/mm/fault.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/arch/arm/mm/fault.c 2011-04-17 15:56:45.000000000 -0= 400 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -453,9 +453,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mm/fault.c linux-= 2.6.32.38/arch/arm/mm/fault /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.32.38/arch/arm/mm/mmap.c linux-2.6.32.38/arch/arm/m= m/mmap.c ---- linux-2.6.32.38/arch/arm/mm/mmap.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/arch/arm/mm/mmap.c 2011-04-17 15:56:45.000000000 -04= 00 +diff -urNp linux-2.6.32.39/arch/arm/mm/mmap.c linux-2.6.32.39/arch/arm/m= m/mmap.c +--- linux-2.6.32.39/arch/arm/mm/mmap.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/arch/arm/mm/mmap.c 2011-04-17 15:56:45.000000000 -04= 00 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -505,9 +505,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mm/mmap.c linux-2= .6.32.38/arch/arm/mm/mmap.c /* * Remember the place where we stopped the search: */ -diff -urNp linux-2.6.32.38/arch/arm/plat-s3c/pm.c linux-2.6.32.38/arch/a= rm/plat-s3c/pm.c ---- linux-2.6.32.38/arch/arm/plat-s3c/pm.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/arm/plat-s3c/pm.c 2011-04-17 15:56:45.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/arm/plat-s3c/pm.c linux-2.6.32.39/arch/a= rm/plat-s3c/pm.c +--- linux-2.6.32.39/arch/arm/plat-s3c/pm.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/arm/plat-s3c/pm.c 2011-04-17 15:56:45.000000000= -0400 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } @@ -517,9 +517,9 @@ diff -urNp linux-2.6.32.38/arch/arm/plat-s3c/pm.c lin= ux-2.6.32.38/arch/arm/plat- .enter =3D s3c_pm_enter, .prepare =3D s3c_pm_prepare, .finish =3D s3c_pm_finish, -diff -urNp linux-2.6.32.38/arch/avr32/include/asm/elf.h linux-2.6.32.38/= arch/avr32/include/asm/elf.h ---- linux-2.6.32.38/arch/avr32/include/asm/elf.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/avr32/include/asm/elf.h 2011-04-17 15:56:45.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/avr32/include/asm/elf.h linux-2.6.32.39/= arch/avr32/include/asm/elf.h +--- linux-2.6.32.39/arch/avr32/include/asm/elf.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/avr32/include/asm/elf.h 2011-04-17 15:56:45.000= 000000 -0400 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -536,9 +536,9 @@ diff -urNp linux-2.6.32.38/arch/avr32/include/asm/elf= .h linux-2.6.32.38/arch/avr =20 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space= , -diff -urNp linux-2.6.32.38/arch/avr32/include/asm/kmap_types.h linux-2.6= .32.38/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.32.38/arch/avr32/include/asm/kmap_types.h 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:56= :45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h linux-2.6= .32.39/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:56= :45.000000000 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -549,9 +549,9 @@ diff -urNp linux-2.6.32.38/arch/avr32/include/asm/kma= p_types.h linux-2.6.32.38/a }; =20 #undef D -diff -urNp linux-2.6.32.38/arch/avr32/mach-at32ap/pm.c linux-2.6.32.38/a= rch/avr32/mach-at32ap/pm.c ---- linux-2.6.32.38/arch/avr32/mach-at32ap/pm.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/avr32/mach-at32ap/pm.c 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c linux-2.6.32.39/a= rch/avr32/mach-at32ap/pm.c +--- linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c 2011-04-17 15:56:45.0000= 00000 -0400 @@ -176,7 +176,7 @@ out: return 0; } @@ -561,9 +561,9 @@ diff -urNp linux-2.6.32.38/arch/avr32/mach-at32ap/pm.= c linux-2.6.32.38/arch/avr3 .valid =3D avr32_pm_valid_state, .enter =3D avr32_pm_enter, }; -diff -urNp linux-2.6.32.38/arch/avr32/mm/fault.c linux-2.6.32.38/arch/av= r32/mm/fault.c ---- linux-2.6.32.38/arch/avr32/mm/fault.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/avr32/mm/fault.c 2011-04-17 15:56:45.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/avr32/mm/fault.c linux-2.6.32.39/arch/av= r32/mm/fault.c +--- linux-2.6.32.39/arch/avr32/mm/fault.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/avr32/mm/fault.c 2011-04-17 15:56:45.000000000 = -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru =20 int exception_trace =3D 1; @@ -605,9 +605,9 @@ diff -urNp linux-2.6.32.38/arch/avr32/mm/fault.c linu= x-2.6.32.38/arch/avr32/mm/f if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.32.38/arch/blackfin/kernel/kgdb.c linux-2.6.32.38/a= rch/blackfin/kernel/kgdb.c ---- linux-2.6.32.38/arch/blackfin/kernel/kgdb.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/blackfin/kernel/kgdb.c 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/blackfin/kernel/kgdb.c linux-2.6.32.39/a= rch/blackfin/kernel/kgdb.c +--- linux-2.6.32.39/arch/blackfin/kernel/kgdb.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/blackfin/kernel/kgdb.c 2011-04-17 15:56:45.0000= 00000 -0400 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto return -1; /* this means that we do not want to exit from the handler= */ } @@ -617,9 +617,9 @@ diff -urNp linux-2.6.32.38/arch/blackfin/kernel/kgdb.= c linux-2.6.32.38/arch/blac .gdb_bpt_instr =3D {0xa1}, #ifdef CONFIG_SMP .flags =3D KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.32.38/arch/blackfin/mach-common/pm.c linux-2.6.32.3= 8/arch/blackfin/mach-common/pm.c ---- linux-2.6.32.38/arch/blackfin/mach-common/pm.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/blackfin/mach-common/pm.c 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/blackfin/mach-common/pm.c linux-2.6.32.3= 9/arch/blackfin/mach-common/pm.c +--- linux-2.6.32.39/arch/blackfin/mach-common/pm.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/blackfin/mach-common/pm.c 2011-04-17 15:56:45.0= 00000000 -0400 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } @@ -629,9 +629,9 @@ diff -urNp linux-2.6.32.38/arch/blackfin/mach-common/= pm.c linux-2.6.32.38/arch/b .enter =3D bfin_pm_enter, .valid =3D bfin_pm_valid, }; -diff -urNp linux-2.6.32.38/arch/frv/include/asm/kmap_types.h linux-2.6.3= 2.38/arch/frv/include/asm/kmap_types.h ---- linux-2.6.32.38/arch/frv/include/asm/kmap_types.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/frv/include/asm/kmap_types.h 2011-04-17 15:56:4= 5.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/frv/include/asm/kmap_types.h linux-2.6.3= 2.39/arch/frv/include/asm/kmap_types.h +--- linux-2.6.32.39/arch/frv/include/asm/kmap_types.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/frv/include/asm/kmap_types.h 2011-04-17 15:56:4= 5.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -640,9 +640,9 @@ diff -urNp linux-2.6.32.38/arch/frv/include/asm/kmap_= types.h linux-2.6.32.38/arc KM_TYPE_NR }; =20 -diff -urNp linux-2.6.32.38/arch/frv/mm/elf-fdpic.c linux-2.6.32.38/arch/= frv/mm/elf-fdpic.c ---- linux-2.6.32.38/arch/frv/mm/elf-fdpic.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/frv/mm/elf-fdpic.c 2011-04-17 15:56:45.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/frv/mm/elf-fdpic.c linux-2.6.32.39/arch/= frv/mm/elf-fdpic.c +--- linux-2.6.32.39/arch/frv/mm/elf-fdpic.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/frv/mm/elf-fdpic.c 2011-04-17 15:56:45.00000000= 0 -0400 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str if (addr) { addr =3D PAGE_ALIGN(addr); @@ -671,9 +671,9 @@ diff -urNp linux-2.6.32.38/arch/frv/mm/elf-fdpic.c li= nux-2.6.32.38/arch/frv/mm/e goto success; addr =3D vma->vm_end; } -diff -urNp linux-2.6.32.38/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32= .38/arch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.32.38/arch/ia64/hp/common/hwsw_iommu.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:56:45= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32= .39/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:56:45= .000000000 -0400 @@ -17,7 +17,7 @@ #include #include @@ -692,9 +692,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/hp/common/hwsw_i= ommu.c linux-2.6.32.38/arch { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.32.38/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.= 38/arch/ia64/hp/common/sba_iommu.c ---- linux-2.6.32.38/arch/ia64/hp/common/sba_iommu.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.= 39/arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:56:45.= 000000000 -0400 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -713,9 +713,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/hp/common/sba_io= mmu.c linux-2.6.32.38/arch/ .alloc_coherent =3D sba_alloc_coherent, .free_coherent =3D sba_free_coherent, .map_page =3D sba_map_page, -diff -urNp linux-2.6.32.38/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.38= /arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.32.38/arch/ia64/ia32/binfmt_elf32.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/ia64/ia32/binfmt_elf32.c 2011-04-17 15:56:45.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.39= /arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c 2011-04-17 15:56:45.00= 0000000 -0400 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ =20 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_sta= ck)) @@ -730,9 +730,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/ia32/binfmt_elf3= 2.c linux-2.6.32.38/arch/ia /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" =20 -diff -urNp linux-2.6.32.38/arch/ia64/ia32/ia32priv.h linux-2.6.32.38/arc= h/ia64/ia32/ia32priv.h ---- linux-2.6.32.38/arch/ia64/ia32/ia32priv.h 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/ia64/ia32/ia32priv.h 2011-04-17 15:56:45.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/ia32/ia32priv.h linux-2.6.32.39/arc= h/ia64/ia32/ia32priv.h +--- linux-2.6.32.39/arch/ia64/ia32/ia32priv.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/ia64/ia32/ia32priv.h 2011-04-17 15:56:45.000000= 000 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -749,9 +749,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/ia32/ia32priv.h = linux-2.6.32.38/arch/ia64/i #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE =20 -diff -urNp linux-2.6.32.38/arch/ia64/include/asm/dma-mapping.h linux-2.6= .32.38/arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.32.38/arch/ia64/include/asm/dma-mapping.h 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:56= :45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h linux-2.6= .32.39/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:56= :45.000000000 -0400 @@ -12,7 +12,7 @@ =20 #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/dma-= mapping.h linux-2.6.32.38/a return ops->dma_supported(dev, mask); } =20 -diff -urNp linux-2.6.32.38/arch/ia64/include/asm/elf.h linux-2.6.32.38/a= rch/ia64/include/asm/elf.h ---- linux-2.6.32.38/arch/ia64/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/ia64/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/include/asm/elf.h linux-2.6.32.39/a= rch/ia64/include/asm/elf.h +--- linux-2.6.32.39/arch/ia64/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/ia64/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -812,9 +812,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/elf.= h linux-2.6.32.38/arch/ia64 #define PT_IA_64_UNWIND 0x70000001 =20 /* IA-64 relocations: */ -diff -urNp linux-2.6.32.38/arch/ia64/include/asm/machvec.h linux-2.6.32.= 38/arch/ia64/include/asm/machvec.h ---- linux-2.6.32.38/arch/ia64/include/asm/machvec.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/ia64/include/asm/machvec.h 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/include/asm/machvec.h linux-2.6.32.= 39/arch/ia64/include/asm/machvec.h +--- linux-2.6.32.39/arch/ia64/include/asm/machvec.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/ia64/include/asm/machvec.h 2011-04-17 15:56:45.= 000000000 -0400 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -833,9 +833,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/mach= vec.h linux-2.6.32.38/arch/ =20 /* * Define default versions so we can extend machvec for new platforms w= ithout having -diff -urNp linux-2.6.32.38/arch/ia64/include/asm/pgtable.h linux-2.6.32.= 38/arch/ia64/include/asm/pgtable.h ---- linux-2.6.32.38/arch/ia64/include/asm/pgtable.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/ia64/include/asm/pgtable.h 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/include/asm/pgtable.h linux-2.6.32.= 39/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32.39/arch/ia64/include/asm/pgtable.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/ia64/include/asm/pgtable.h 2011-04-17 15:56:45.= 000000000 -0400 @@ -12,7 +12,7 @@ * David Mosberger-Tang */ @@ -863,9 +863,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/pgta= ble.h linux-2.6.32.38/arch/ #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX= ) -diff -urNp linux-2.6.32.38/arch/ia64/include/asm/spinlock.h linux-2.6.32= .38/arch/ia64/include/asm/spinlock.h ---- linux-2.6.32.38/arch/ia64/include/asm/spinlock.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/ia64/include/asm/spinlock.h 2011-04-17 15:56:45= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/include/asm/spinlock.h linux-2.6.32= .39/arch/ia64/include/asm/spinlock.h +--- linux-2.6.32.39/arch/ia64/include/asm/spinlock.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/ia64/include/asm/spinlock.h 2011-04-17 15:56:45= .000000000 -0400 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi unsigned short *p =3D (unsigned short *)&lock->lock + 1, tmp; =20 @@ -875,9 +875,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/spin= lock.h linux-2.6.32.38/arch } =20 static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *l= ock) -diff -urNp linux-2.6.32.38/arch/ia64/include/asm/uaccess.h linux-2.6.32.= 38/arch/ia64/include/asm/uaccess.h ---- linux-2.6.32.38/arch/ia64/include/asm/uaccess.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/ia64/include/asm/uaccess.h 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/include/asm/uaccess.h linux-2.6.32.= 39/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32.39/arch/ia64/include/asm/uaccess.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/ia64/include/asm/uaccess.h 2011-04-17 15:56:45.= 000000000 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from =3D (from); \ long __cu_len =3D (n); \ @@ -896,9 +896,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/uacc= ess.h linux-2.6.32.38/arch/ __cu_len =3D __copy_user((__force void __user *) __cu_to, __cu_from, = __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.32.38/arch/ia64/kernel/dma-mapping.c linux-2.6.32.3= 8/arch/ia64/kernel/dma-mapping.c ---- linux-2.6.32.38/arch/ia64/kernel/dma-mapping.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c linux-2.6.32.3= 9/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:56:45.0= 00000000 -0400 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -917,9 +917,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/dma-mappi= ng.c linux-2.6.32.38/arch/i { return dma_ops; } -diff -urNp linux-2.6.32.38/arch/ia64/kernel/module.c linux-2.6.32.38/arc= h/ia64/kernel/module.c ---- linux-2.6.32.38/arch/ia64/kernel/module.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/ia64/kernel/module.c 2011-04-17 15:56:45.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/kernel/module.c linux-2.6.32.39/arc= h/ia64/kernel/module.c +--- linux-2.6.32.39/arch/ia64/kernel/module.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/ia64/kernel/module.c 2011-04-17 15:56:45.000000= 000 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -1008,9 +1008,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/module.= c linux-2.6.32.38/arch/ia64/k mod->arch.gp =3D gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.32.38/arch/ia64/kernel/pci-dma.c linux-2.6.32.38/ar= ch/ia64/kernel/pci-dma.c ---- linux-2.6.32.38/arch/ia64/kernel/pci-dma.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/ia64/kernel/pci-dma.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/kernel/pci-dma.c linux-2.6.32.39/ar= ch/ia64/kernel/pci-dma.c +--- linux-2.6.32.39/arch/ia64/kernel/pci-dma.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/ia64/kernel/pci-dma.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -43,7 +43,7 @@ struct device fallback_dev =3D { .dma_mask =3D &fallback_dev.coherent_dma_mask, }; @@ -1062,9 +1062,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/pci-dma= .c linux-2.6.32.38/arch/ia64/ =20 /* * The order of these functions is important for -diff -urNp linux-2.6.32.38/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.3= 8/arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.32.38/arch/ia64/kernel/pci-swiotlb.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.3= 9/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:56:45.0= 00000000 -0400 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -1074,9 +1074,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/pci-swi= otlb.c linux-2.6.32.38/arch/i .alloc_coherent =3D ia64_swiotlb_alloc_coherent, .free_coherent =3D swiotlb_free_coherent, .map_page =3D swiotlb_map_page, -diff -urNp linux-2.6.32.38/arch/ia64/kernel/sys_ia64.c linux-2.6.32.38/a= rch/ia64/kernel/sys_ia64.c ---- linux-2.6.32.38/arch/ia64/kernel/sys_ia64.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c linux-2.6.32.39/a= rch/ia64/kernel/sys_ia64.c +--- linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:56:45.0000= 00000 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) =3D=3D RGN_HPAGE) addr =3D 0; @@ -1109,9 +1109,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/sys_ia6= 4.c linux-2.6.32.38/arch/ia64 /* Remember the address where we stopped this search: */ mm->free_area_cache =3D addr + len; return addr; -diff -urNp linux-2.6.32.38/arch/ia64/kernel/topology.c linux-2.6.32.38/a= rch/ia64/kernel/topology.c ---- linux-2.6.32.38/arch/ia64/kernel/topology.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/ia64/kernel/topology.c 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/kernel/topology.c linux-2.6.32.39/a= rch/ia64/kernel/topology.c +--- linux-2.6.32.39/arch/ia64/kernel/topology.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/ia64/kernel/topology.c 2011-04-17 15:56:45.0000= 00000 -0400 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/topolog= y.c linux-2.6.32.38/arch/ia64 .show =3D cache_show }; =20 -diff -urNp linux-2.6.32.38/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.3= 8/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.32.38/arch/ia64/kernel/vmlinux.lds.S 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.3= 9/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:56:45.0= 00000000 -0400 @@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . =3D ALIGN(PERCPU_PAGE_SIZE); @@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/vmlinux= .lds.S linux-2.6.32.38/arch/i . =3D __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data = fits * into percpu page size */ -diff -urNp linux-2.6.32.38/arch/ia64/mm/fault.c linux-2.6.32.38/arch/ia6= 4/mm/fault.c ---- linux-2.6.32.38/arch/ia64/mm/fault.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/arch/ia64/mm/fault.c 2011-04-17 15:56:45.000000000 -= 0400 +diff -urNp linux-2.6.32.39/arch/ia64/mm/fault.c linux-2.6.32.39/arch/ia6= 4/mm/fault.c +--- linux-2.6.32.39/arch/ia64/mm/fault.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/arch/ia64/mm/fault.c 2011-04-17 15:56:45.000000000 -= 0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned=20 return pte_present(pte); } @@ -1185,9 +1185,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/mm/fault.c lin= ux-2.6.32.38/arch/ia64/mm/fau survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.38/arch/ia64/mm/hugetlbpage.c linux-2.6.32.38/ar= ch/ia64/mm/hugetlbpage.c ---- linux-2.6.32.38/arch/ia64/mm/hugetlbpage.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c linux-2.6.32.39/ar= ch/ia64/mm/hugetlbpage.c +--- linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area( /* At this point: (!vmm || addr < vmm->vm_end). */ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) @@ -1197,9 +1197,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/mm/hugetlbpage= .c linux-2.6.32.38/arch/ia64/ return addr; addr =3D ALIGN(vmm->vm_end, HPAGE_SIZE); } -diff -urNp linux-2.6.32.38/arch/ia64/mm/init.c linux-2.6.32.38/arch/ia64= /mm/init.c ---- linux-2.6.32.38/arch/ia64/mm/init.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/arch/ia64/mm/init.c 2011-04-17 15:56:45.000000000 -0= 400 +diff -urNp linux-2.6.32.39/arch/ia64/mm/init.c linux-2.6.32.39/arch/ia64= /mm/init.c +--- linux-2.6.32.39/arch/ia64/mm/init.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/arch/ia64/mm/init.c 2011-04-17 15:56:45.000000000 -0= 400 @@ -122,6 +122,19 @@ ia64_init_addr_space (void) vma->vm_start =3D current->thread.rbs_bot & PAGE_MASK; vma->vm_end =3D vma->vm_start + PAGE_SIZE; @@ -1220,9 +1220,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/mm/init.c linu= x-2.6.32.38/arch/ia64/mm/init vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.32.38/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.38/ar= ch/ia64/sn/pci/pci_dma.c ---- linux-2.6.32.38/arch/ia64/sn/pci/pci_dma.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.39/ar= ch/ia64/sn/pci/pci_dma.c +--- linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1232,9 +1232,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/sn/pci/pci_dma= .c linux-2.6.32.38/arch/ia64/ .alloc_coherent =3D sn_dma_alloc_coherent, .free_coherent =3D sn_dma_free_coherent, .map_page =3D sn_dma_map_page, -diff -urNp linux-2.6.32.38/arch/m32r/lib/usercopy.c linux-2.6.32.38/arch= /m32r/lib/usercopy.c ---- linux-2.6.32.38/arch/m32r/lib/usercopy.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/m32r/lib/usercopy.c 2011-04-17 15:56:45.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/m32r/lib/usercopy.c linux-2.6.32.39/arch= /m32r/lib/usercopy.c +--- linux-2.6.32.39/arch/m32r/lib/usercopy.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/m32r/lib/usercopy.c 2011-04-17 15:56:45.0000000= 00 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long= n) @@ -1255,9 +1255,9 @@ diff -urNp linux-2.6.32.38/arch/m32r/lib/usercopy.c= linux-2.6.32.38/arch/m32r/li prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.32.38/arch/mips/alchemy/devboards/pm.c linux-2.6.32= .38/arch/mips/alchemy/devboards/pm.c ---- linux-2.6.32.38/arch/mips/alchemy/devboards/pm.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/mips/alchemy/devboards/pm.c 2011-04-17 15:56:45= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c linux-2.6.32= .39/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c 2011-04-17 15:56:45= .000000000 -0400 @@ -78,7 +78,7 @@ static void db1x_pm_end(void) =20 } @@ -1267,9 +1267,9 @@ diff -urNp linux-2.6.32.38/arch/mips/alchemy/devboa= rds/pm.c linux-2.6.32.38/arch .valid =3D suspend_valid_only_mem, .begin =3D db1x_pm_begin, .enter =3D db1x_pm_enter, -diff -urNp linux-2.6.32.38/arch/mips/include/asm/elf.h linux-2.6.32.38/a= rch/mips/include/asm/elf.h ---- linux-2.6.32.38/arch/mips/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/mips/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/mips/include/asm/elf.h linux-2.6.32.39/a= rch/mips/include/asm/elf.h +--- linux-2.6.32.39/arch/mips/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/mips/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1282,9 +1282,9 @@ diff -urNp linux-2.6.32.38/arch/mips/include/asm/el= f.h linux-2.6.32.38/arch/mips +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.32.38/arch/mips/include/asm/page.h linux-2.6.32.38/= arch/mips/include/asm/page.h ---- linux-2.6.32.38/arch/mips/include/asm/page.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/mips/include/asm/page.h 2011-04-17 15:56:45.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/mips/include/asm/page.h linux-2.6.32.39/= arch/mips/include/asm/page.h +--- linux-2.6.32.39/arch/mips/include/asm/page.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/mips/include/asm/page.h 2011-04-17 15:56:45.000= 000000 -0400 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; @@ -1294,9 +1294,9 @@ diff -urNp linux-2.6.32.38/arch/mips/include/asm/pa= ge.h linux-2.6.32.38/arch/mip #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.32.38/arch/mips/include/asm/system.h linux-2.6.32.3= 8/arch/mips/include/asm/system.h ---- linux-2.6.32.38/arch/mips/include/asm/system.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/mips/include/asm/system.h 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/mips/include/asm/system.h linux-2.6.32.3= 9/arch/mips/include/asm/system.h +--- linux-2.6.32.39/arch/mips/include/asm/system.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/mips/include/asm/system.h 2011-04-17 15:56:45.0= 00000000 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1305,9 +1305,9 @@ diff -urNp linux-2.6.32.38/arch/mips/include/asm/sy= stem.h linux-2.6.32.38/arch/m +#define arch_align_stack(x) ((x) & ~0xfUL) =20 #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.32.38/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32= .38/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.32.38/arch/mips/kernel/binfmt_elfn32.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:56:45= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32= .39/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:56:45= .000000000 -0400 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1322,9 +1322,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/binfmt_= elfn32.c linux-2.6.32.38/arch #include #include #include -diff -urNp linux-2.6.32.38/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32= .38/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.32.38/arch/mips/kernel/binfmt_elfo32.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:56:45= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32= .39/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:56:45= .000000000 -0400 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1339,9 +1339,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/binfmt_= elfo32.c linux-2.6.32.38/arch #include =20 /* -diff -urNp linux-2.6.32.38/arch/mips/kernel/kgdb.c linux-2.6.32.38/arch/= mips/kernel/kgdb.c ---- linux-2.6.32.38/arch/mips/kernel/kgdb.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/mips/kernel/kgdb.c 2011-04-17 15:56:45.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/mips/kernel/kgdb.c linux-2.6.32.39/arch/= mips/kernel/kgdb.c +--- linux-2.6.32.39/arch/mips/kernel/kgdb.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/mips/kernel/kgdb.c 2011-04-17 15:56:45.00000000= 0 -0400 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1350,9 +1350,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/kgdb.c = linux-2.6.32.38/arch/mips/ker struct kgdb_arch arch_kgdb_ops; =20 /* -diff -urNp linux-2.6.32.38/arch/mips/kernel/process.c linux-2.6.32.38/ar= ch/mips/kernel/process.c ---- linux-2.6.32.38/arch/mips/kernel/process.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/mips/kernel/process.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/mips/kernel/process.c linux-2.6.32.39/ar= ch/mips/kernel/process.c +--- linux-2.6.32.39/arch/mips/kernel/process.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/mips/kernel/process.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1369,9 +1369,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/process= .c linux-2.6.32.38/arch/mips/ - - return sp & ALMASK; -} -diff -urNp linux-2.6.32.38/arch/mips/kernel/syscall.c linux-2.6.32.38/ar= ch/mips/kernel/syscall.c ---- linux-2.6.32.38/arch/mips/kernel/syscall.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/mips/kernel/syscall.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/mips/kernel/syscall.c linux-2.6.32.39/ar= ch/mips/kernel/syscall.c +--- linux-2.6.32.39/arch/mips/kernel/syscall.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/mips/kernel/syscall.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str do_color_align =3D 0; if (filp || (flags & MAP_SHARED)) @@ -1406,9 +1406,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/syscall= .c linux-2.6.32.38/arch/mips/ return addr; addr =3D vmm->vm_end; if (do_color_align) -diff -urNp linux-2.6.32.38/arch/mips/mm/fault.c linux-2.6.32.38/arch/mip= s/mm/fault.c ---- linux-2.6.32.38/arch/mips/mm/fault.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/arch/mips/mm/fault.c 2011-04-17 15:56:45.000000000 -= 0400 +diff -urNp linux-2.6.32.39/arch/mips/mm/fault.c linux-2.6.32.39/arch/mip= s/mm/fault.c +--- linux-2.6.32.39/arch/mips/mm/fault.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/arch/mips/mm/fault.c 2011-04-17 15:56:45.000000000 -= 0400 @@ -26,6 +26,23 @@ #include #include /* For VMALLOC_END */ @@ -1433,9 +1433,9 @@ diff -urNp linux-2.6.32.38/arch/mips/mm/fault.c lin= ux-2.6.32.38/arch/mips/mm/fau /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.32.38/arch/parisc/include/asm/elf.h linux-2.6.32.38= /arch/parisc/include/asm/elf.h ---- linux-2.6.32.38/arch/parisc/include/asm/elf.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/parisc/include/asm/elf.h 2011-04-17 15:56:45.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/parisc/include/asm/elf.h linux-2.6.32.39= /arch/parisc/include/asm/elf.h +--- linux-2.6.32.39/arch/parisc/include/asm/elf.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/parisc/include/asm/elf.h 2011-04-17 15:56:45.00= 0000000 -0400 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1450,9 +1450,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/include/asm/= elf.h linux-2.6.32.38/arch/pa /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space= , but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.32.38/arch/parisc/include/asm/pgtable.h linux-2.6.3= 2.38/arch/parisc/include/asm/pgtable.h ---- linux-2.6.32.38/arch/parisc/include/asm/pgtable.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/parisc/include/asm/pgtable.h 2011-04-17 15:56:4= 5.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/parisc/include/asm/pgtable.h linux-2.6.3= 2.39/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32.39/arch/parisc/include/asm/pgtable.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/parisc/include/asm/pgtable.h 2011-04-17 15:56:4= 5.000000000 -0400 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_REA= D | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1471,9 +1471,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/include/asm/= pgtable.h linux-2.6.32.38/arc #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.32.38/arch/parisc/kernel/module.c linux-2.6.32.38/a= rch/parisc/kernel/module.c ---- linux-2.6.32.38/arch/parisc/kernel/module.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/parisc/kernel/module.c 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/parisc/kernel/module.c linux-2.6.32.39/a= rch/parisc/kernel/module.c +--- linux-2.6.32.39/arch/parisc/kernel/module.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/parisc/kernel/module.c 2011-04-17 15:56:45.0000= 00000 -0400 @@ -95,16 +95,38 @@ =20 /* three functions to determine where in the module core @@ -1574,9 +1574,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/kernel/modul= e.c linux-2.6.32.38/arch/pari =20 DEBUGP("register_unwind_table(), sect =3D %d at 0x%p - 0x%p (gp=3D0x%l= x)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.32.38/arch/parisc/kernel/sys_parisc.c linux-2.6.32.= 38/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.32.38/arch/parisc/kernel/sys_parisc.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c linux-2.6.32.= 39/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:56:45.= 000000000 -0400 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) @@ -1604,9 +1604,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/kernel/sys_p= arisc.c linux-2.6.32.38/arch/ =20 if (filp) { addr =3D get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.32.38/arch/parisc/kernel/traps.c linux-2.6.32.38/ar= ch/parisc/kernel/traps.c ---- linux-2.6.32.38/arch/parisc/kernel/traps.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/parisc/kernel/traps.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/parisc/kernel/traps.c linux-2.6.32.39/ar= ch/parisc/kernel/traps.c +--- linux-2.6.32.39/arch/parisc/kernel/traps.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/parisc/kernel/traps.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod =20 down_read(¤t->mm->mmap_sem); @@ -1618,9 +1618,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/kernel/traps= .c linux-2.6.32.38/arch/paris fault_address =3D regs->iaoq[0]; fault_space =3D regs->iasq[0]; =20 -diff -urNp linux-2.6.32.38/arch/parisc/mm/fault.c linux-2.6.32.38/arch/p= arisc/mm/fault.c ---- linux-2.6.32.38/arch/parisc/mm/fault.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/parisc/mm/fault.c 2011-04-17 15:56:45.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/parisc/mm/fault.c linux-2.6.32.39/arch/p= arisc/mm/fault.c +--- linux-2.6.32.39/arch/parisc/mm/fault.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/parisc/mm/fault.c 2011-04-17 15:56:45.000000000= -0400 @@ -15,6 +15,7 @@ #include #include @@ -1790,9 +1790,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/mm/fault.c l= inux-2.6.32.38/arch/parisc/mm =20 /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/device.h linux-2.6.3= 2.38/arch/powerpc/include/asm/device.h ---- linux-2.6.32.38/arch/powerpc/include/asm/device.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/device.h 2011-04-17 15:56:4= 5.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/device.h linux-2.6.3= 2.39/arch/powerpc/include/asm/device.h +--- linux-2.6.32.39/arch/powerpc/include/asm/device.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/device.h 2011-04-17 15:56:4= 5.000000000 -0400 @@ -14,7 +14,7 @@ struct dev_archdata { struct device_node *of_node; =20 @@ -1802,9 +1802,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /device.h linux-2.6.32.38/arc =20 /* * When an iommu is in use, dma_data is used as a ptr to the base of t= he -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/dma-mapping.h linux-= 2.6.32.38/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.32.38/arch/powerpc/include/asm/dma-mapping.h 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15= :56:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h linux-= 2.6.32.39/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15= :56:45.000000000 -0400 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma #ifdef CONFIG_PPC64 extern struct dma_map_ops dma_iommu_ops; @@ -1871,9 +1871,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /dma-mapping.h linux-2.6.32.3 =20 if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/elf.h linux-2.6.32.3= 8/arch/powerpc/include/asm/elf.h ---- linux-2.6.32.38/arch/powerpc/include/asm/elf.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/elf.h 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/elf.h linux-2.6.32.3= 9/arch/powerpc/include/asm/elf.h +--- linux-2.6.32.39/arch/powerpc/include/asm/elf.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/elf.h 2011-04-17 15:56:45.0= 00000000 -0400 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -1906,9 +1906,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /elf.h linux-2.6.32.38/arch/p #endif /* __KERNEL__ */ =20 /* -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/iommu.h linux-2.6.32= .38/arch/powerpc/include/asm/iommu.h ---- linux-2.6.32.38/arch/powerpc/include/asm/iommu.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/iommu.h 2011-04-17 15:56:45= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/iommu.h linux-2.6.32= .39/arch/powerpc/include/asm/iommu.h +--- linux-2.6.32.39/arch/powerpc/include/asm/iommu.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/iommu.h 2011-04-17 15:56:45= .000000000 -0400 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi extern void iommu_init_early_dart(void); extern void iommu_init_early_pasemi(void); @@ -1919,9 +1919,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /iommu.h linux-2.6.32.38/arch #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/kmap_types.h linux-2= .6.32.38/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.32.38/arch/powerpc/include/asm/kmap_types.h 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:= 56:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h linux-2= .6.32.39/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:= 56:45.000000000 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -1930,9 +1930,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /kmap_types.h linux-2.6.32.38 KM_TYPE_NR }; =20 -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/page_64.h linux-2.6.= 32.38/arch/powerpc/include/asm/page_64.h ---- linux-2.6.32.38/arch/powerpc/include/asm/page_64.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/page_64.h 2011-04-17 15:56:= 45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/page_64.h linux-2.6.= 32.39/arch/powerpc/include/asm/page_64.h +--- linux-2.6.32.39/arch/powerpc/include/asm/page_64.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/page_64.h 2011-04-17 15:56:= 45.000000000 -0400 @@ -180,15 +180,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -1954,9 +1954,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /page_64.h linux-2.6.32.38/ar =20 #include =20 -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/page.h linux-2.6.32.= 38/arch/powerpc/include/asm/page.h ---- linux-2.6.32.38/arch/powerpc/include/asm/page.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/page.h 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/page.h linux-2.6.32.= 39/arch/powerpc/include/asm/page.h +--- linux-2.6.32.39/arch/powerpc/include/asm/page.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/page.h 2011-04-17 15:56:45.= 000000000 -0400 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -1979,9 +1979,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /page.h linux-2.6.32.38/arch/ #ifndef __ASSEMBLY__ =20 #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pci.h linux-2.6.32.3= 8/arch/powerpc/include/asm/pci.h ---- linux-2.6.32.38/arch/powerpc/include/asm/pci.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/pci.h 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pci.h linux-2.6.32.3= 9/arch/powerpc/include/asm/pci.h +--- linux-2.6.32.39/arch/powerpc/include/asm/pci.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/pci.h 2011-04-17 15:56:45.0= 00000000 -0400 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } =20 @@ -1993,9 +1993,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /pci.h linux-2.6.32.38/arch/p #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pgtable.h linux-2.6.= 32.38/arch/powerpc/include/asm/pgtable.h ---- linux-2.6.32.38/arch/powerpc/include/asm/pgtable.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:56:= 45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h linux-2.6.= 32.39/arch/powerpc/include/asm/pgtable.h +--- linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:56:= 45.000000000 -0400 @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ @@ -2004,9 +2004,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /pgtable.h linux-2.6.32.38/ar #ifndef __ASSEMBLY__ #include /* For TASK_SIZE */ #include -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pte-hash32.h linux-2= .6.32.38/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.32.38/arch/powerpc/include/asm/pte-hash32.h 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:= 56:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h linux-2= .6.32.39/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:= 56:45.000000000 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -2015,9 +2015,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /pte-hash32.h linux-2.6.32.38 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP system= s) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/reg.h linux-2.6.32.3= 8/arch/powerpc/include/asm/reg.h ---- linux-2.6.32.38/arch/powerpc/include/asm/reg.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/reg.h 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/reg.h linux-2.6.32.3= 9/arch/powerpc/include/asm/reg.h +--- linux-2.6.32.39/arch/powerpc/include/asm/reg.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/reg.h 2011-04-17 15:56:45.0= 00000000 -0400 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -2026,9 +2026,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /reg.h linux-2.6.32.38/arch/p #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/swiotlb.h linux-2.6.= 32.38/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.32.38/arch/powerpc/include/asm/swiotlb.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:56:= 45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h linux-2.6.= 32.39/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:56:= 45.000000000 -0400 @@ -13,7 +13,7 @@ =20 #include @@ -2038,9 +2038,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /swiotlb.h linux-2.6.32.38/ar =20 static inline void dma_mark_clean(void *addr, size_t size) {} =20 -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/system.h linux-2.6.3= 2.38/arch/powerpc/include/asm/system.h ---- linux-2.6.32.38/arch/powerpc/include/asm/system.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/system.h 2011-04-17 15:56:4= 5.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/system.h linux-2.6.3= 2.39/arch/powerpc/include/asm/system.h +--- linux-2.6.32.39/arch/powerpc/include/asm/system.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/system.h 2011-04-17 15:56:4= 5.000000000 -0400 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o)= , (n)) #endif @@ -2050,9 +2050,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /system.h linux-2.6.32.38/arc =20 /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); -diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/uaccess.h linux-2.6.= 32.38/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.32.38/arch/powerpc/include/asm/uaccess.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:56:= 45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h linux-2.6.= 32.39/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:56:= 45.000000000 -0400 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -2230,9 +2230,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm= /uaccess.h linux-2.6.32.38/ar extern unsigned long __clear_user(void __user *addr, unsigned long size= ); =20 static inline unsigned long clear_user(void __user *addr, unsigned long= size) -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.= 38/arch/powerpc/kernel/cacheinfo.c ---- linux-2.6.32.38/arch/powerpc/kernel/cacheinfo.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/cacheinfo.c 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.= 39/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c 2011-04-17 15:56:45.= 000000000 -0400 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2242,9 +2242,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/cach= einfo.c linux-2.6.32.38/arch/ .show =3D cache_index_show, }; =20 -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma.c linux-2.6.32.38/arc= h/powerpc/kernel/dma.c ---- linux-2.6.32.38/arch/powerpc/kernel/dma.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/dma.c 2011-04-17 15:56:45.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma.c linux-2.6.32.39/arc= h/powerpc/kernel/dma.c +--- linux-2.6.32.39/arch/powerpc/kernel/dma.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/dma.c 2011-04-17 15:56:45.000000= 000 -0400 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2254,9 +2254,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma.= c linux-2.6.32.38/arch/powerp .alloc_coherent =3D dma_direct_alloc_coherent, .free_coherent =3D dma_direct_free_coherent, .map_sg =3D dma_direct_map_sg, -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.= 38/arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.32.38/arch/powerpc/kernel/dma-iommu.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.= 39/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:56:45.= 000000000 -0400 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } =20 @@ -2266,9 +2266,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma-= iommu.c linux-2.6.32.38/arch/ { struct iommu_table *tbl =3D get_iommu_table_base(dev); =20 -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.3= 2.38/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.32.38/arch/powerpc/kernel/dma-swiotlb.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:56:4= 5.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.3= 2.39/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:56:4= 5.000000000 -0400 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -2278,9 +2278,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma-= swiotlb.c linux-2.6.32.38/arc .alloc_coherent =3D dma_direct_alloc_coherent, .free_coherent =3D dma_direct_free_coherent, .map_sg =3D swiotlb_map_sg_attrs, -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/exceptions-64e.S linux-2.= 6.32.38/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.32.38/arch/powerpc/kernel/exceptions-64e.S 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:5= 6:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S linux-2.= 6.32.39/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:5= 6:45.000000000 -0400 @@ -455,6 +455,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2299,9 +2299,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/exce= ptions-64e.S linux-2.6.32.38/ addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/exceptions-64s.S linux-2.= 6.32.38/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.32.38/arch/powerpc/kernel/exceptions-64s.S 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:5= 6:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S linux-2.= 6.32.39/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:5= 6:45.000000000 -0400 @@ -818,10 +818,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2314,9 +2314,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/exce= ptions-64s.S linux-2.6.32.38/ mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/ibmebus.c linux-2.6.32.38= /arch/powerpc/kernel/ibmebus.c ---- linux-2.6.32.38/arch/powerpc/kernel/ibmebus.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:56:45.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c linux-2.6.32.39= /arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:56:45.00= 0000000 -0400 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct=20 return 1; } @@ -2326,9 +2326,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/ibme= bus.c linux-2.6.32.38/arch/po .alloc_coherent =3D ibmebus_alloc_coherent, .free_coherent =3D ibmebus_free_coherent, .map_sg =3D ibmebus_map_sg, -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/kgdb.c linux-2.6.32.38/ar= ch/powerpc/kernel/kgdb.c ---- linux-2.6.32.38/arch/powerpc/kernel/kgdb.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/kgdb.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/kgdb.c linux-2.6.32.39/ar= ch/powerpc/kernel/kgdb.c +--- linux-2.6.32.39/arch/powerpc/kernel/kgdb.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/kgdb.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct if (kgdb_handle_exception(0, SIGTRAP, 0, regs) !=3D 0) return 0; @@ -2347,9 +2347,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/kgdb= .c linux-2.6.32.38/arch/power .gdb_bpt_instr =3D {0x7d, 0x82, 0x10, 0x08}, }; =20 -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/module_32.c linux-2.6.32.= 38/arch/powerpc/kernel/module_32.c ---- linux-2.6.32.38/arch/powerpc/kernel/module_32.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/module_32.c 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/module_32.c linux-2.6.32.= 39/arch/powerpc/kernel/module_32.c +--- linux-2.6.32.39/arch/powerpc/kernel/module_32.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/module_32.c 2011-04-17 15:56:45.= 000000000 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section =3D i; } @@ -2379,9 +2379,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/modu= le_32.c linux-2.6.32.38/arch/ =20 /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/module.c linux-2.6.32.38/= arch/powerpc/kernel/module.c ---- linux-2.6.32.38/arch/powerpc/kernel/module.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/module.c 2011-04-17 15:56:45.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/module.c linux-2.6.32.39/= arch/powerpc/kernel/module.c +--- linux-2.6.32.39/arch/powerpc/kernel/module.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/module.c 2011-04-17 15:56:45.000= 000000 -0400 @@ -31,11 +31,24 @@ =20 LIST_HEAD(module_bug_list); @@ -2421,9 +2421,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/modu= le.c linux-2.6.32.38/arch/pow static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/pci-common.c linux-2.6.32= .38/arch/powerpc/kernel/pci-common.c ---- linux-2.6.32.38/arch/powerpc/kernel/pci-common.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/pci-common.c 2011-04-17 15:56:45= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/pci-common.c linux-2.6.32= .39/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32.39/arch/powerpc/kernel/pci-common.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/pci-common.c 2011-04-17 15:56:45= .000000000 -0400 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags =3D 0; =20 @@ -2442,9 +2442,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/pci-= common.c linux-2.6.32.38/arch { return pci_dma_ops; } -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/process.c linux-2.6.32.38= /arch/powerpc/kernel/process.c ---- linux-2.6.32.38/arch/powerpc/kernel/process.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/process.c 2011-04-17 15:56:45.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/process.c linux-2.6.32.39= /arch/powerpc/kernel/process.c +--- linux-2.6.32.39/arch/powerpc/kernel/process.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/process.c 2011-04-17 15:56:45.00= 0000000 -0400 @@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs) * Lookup NIP late so we have the best change of getting the * above info out without failing @@ -2537,9 +2537,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/proc= ess.c linux-2.6.32.38/arch/po - - return ret; -} -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/signal_32.c linux-2.6.32.= 38/arch/powerpc/kernel/signal_32.c ---- linux-2.6.32.38/arch/powerpc/kernel/signal_32.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/signal_32.c 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/signal_32.c linux-2.6.32.= 39/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32.39/arch/powerpc/kernel/signal_32.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/signal_32.c 2011-04-17 15:56:45.= 000000000 -0400 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame =3D &rt_sf->uc.uc_mcontext; @@ -2549,9 +2549,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/sign= al_32.c linux-2.6.32.38/arch/ if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link =3D current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/signal_64.c linux-2.6.32.= 38/arch/powerpc/kernel/signal_64.c ---- linux-2.6.32.38/arch/powerpc/kernel/signal_64.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/signal_64.c 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/signal_64.c linux-2.6.32.= 39/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32.39/arch/powerpc/kernel/signal_64.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/signal_64.c 2011-04-17 15:56:45.= 000000000 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val =3D 0; =20 @@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/sign= al_64.c linux-2.6.32.38/arch/ regs->link =3D current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |=3D setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.= 38/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.32.38/arch/powerpc/kernel/sys_ppc32.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/sys_ppc32.c 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.= 39/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c 2011-04-17 15:56:45.= 000000000 -0400 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { @@ -2577,9 +2577,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/sys_= ppc32.c linux-2.6.32.38/arch/ } return error; } -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/vdso.c linux-2.6.32.38/ar= ch/powerpc/kernel/vdso.c ---- linux-2.6.32.38/arch/powerpc/kernel/vdso.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/vdso.c 2011-04-17 15:56:45.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/vdso.c linux-2.6.32.39/ar= ch/powerpc/kernel/vdso.c +--- linux-2.6.32.39/arch/powerpc/kernel/vdso.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/vdso.c 2011-04-17 15:56:45.00000= 0000 -0400 @@ -36,6 +36,7 @@ #include #include @@ -2606,9 +2606,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/vdso= .c linux-2.6.32.38/arch/power if (IS_ERR_VALUE(vdso_base)) { rc =3D vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.32.38/arch/powerpc/kernel/vio.c linux-2.6.32.38/arc= h/powerpc/kernel/vio.c ---- linux-2.6.32.38/arch/powerpc/kernel/vio.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/powerpc/kernel/vio.c 2011-04-17 15:56:45.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/kernel/vio.c linux-2.6.32.39/arc= h/powerpc/kernel/vio.c +--- linux-2.6.32.39/arch/powerpc/kernel/vio.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/powerpc/kernel/vio.c 2011-04-17 15:56:45.000000= 000 -0400 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc vio_cmo_dealloc(viodev, alloc_size); } @@ -2631,9 +2631,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/vio.= c linux-2.6.32.38/arch/powerp viodev->dev.archdata.dma_ops =3D &vio_dma_mapping_ops; } =20 -diff -urNp linux-2.6.32.38/arch/powerpc/lib/usercopy_64.c linux-2.6.32.3= 8/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.32.38/arch/powerpc/lib/usercopy_64.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c linux-2.6.32.3= 9/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:56:45.0= 00000000 -0400 @@ -9,22 +9,6 @@ #include #include @@ -2665,9 +2665,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/lib/usercop= y_64.c linux-2.6.32.38/arch/p -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); =20 -diff -urNp linux-2.6.32.38/arch/powerpc/mm/fault.c linux-2.6.32.38/arch/= powerpc/mm/fault.c ---- linux-2.6.32.38/arch/powerpc/mm/fault.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/powerpc/mm/fault.c 2011-04-17 15:56:45.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/mm/fault.c linux-2.6.32.39/arch/= powerpc/mm/fault.c +--- linux-2.6.32.39/arch/powerpc/mm/fault.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/powerpc/mm/fault.c 2011-04-17 15:56:45.00000000= 0 -0400 @@ -30,6 +30,10 @@ #include #include @@ -2772,9 +2772,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/mm/fault.c = linux-2.6.32.38/arch/powerpc/ _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.32.38/arch/powerpc/mm/mmap_64.c linux-2.6.32.38/arc= h/powerpc/mm/mmap_64.c ---- linux-2.6.32.38/arch/powerpc/mm/mmap_64.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/powerpc/mm/mmap_64.c 2011-04-17 15:56:45.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/mm/mmap_64.c linux-2.6.32.39/arc= h/powerpc/mm/mmap_64.c +--- linux-2.6.32.39/arch/powerpc/mm/mmap_64.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/powerpc/mm/mmap_64.c 2011-04-17 15:56:45.000000= 000 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2798,9 +2798,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/mm/mmap_64.= c linux-2.6.32.38/arch/powerp mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.38/arch/powerpc/mm/slice.c linux-2.6.32.38/arch/= powerpc/mm/slice.c ---- linux-2.6.32.38/arch/powerpc/mm/slice.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/powerpc/mm/slice.c 2011-04-17 15:56:45.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/mm/slice.c linux-2.6.32.39/arch/= powerpc/mm/slice.c +--- linux-2.6.32.39/arch/powerpc/mm/slice.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/powerpc/mm/slice.c 2011-04-17 15:56:45.00000000= 0 -0400 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ if ((mm->task_size - len) < addr) return 0; @@ -2867,9 +2867,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/mm/slice.c = linux-2.6.32.38/arch/powerpc/ /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr =3D _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c lin= ux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c ---- linux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-03-27= 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-04-17= 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c lin= ux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c +--- linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-04-17= 15:56:45.000000000 -0400 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) lite5200_pm_target_state =3D PM_SUSPEND_ON; } @@ -2879,9 +2879,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/5= 2xx/lite5200_pm.c linux-2.6.3 .valid =3D lite5200_pm_valid, .begin =3D lite5200_pm_begin, .prepare =3D lite5200_pm_prepare, -diff -urNp linux-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c linu= x-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c ---- linux-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-03-27 = 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-04-17 = 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c linu= x-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c +--- linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-04-17 = 15:56:45.000000000 -0400 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) iounmap(mbar); } @@ -2891,9 +2891,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/5= 2xx/mpc52xx_pm.c linux-2.6.32 .valid =3D mpc52xx_pm_valid, .prepare =3D mpc52xx_pm_prepare, .enter =3D mpc52xx_pm_enter, -diff -urNp linux-2.6.32.38/arch/powerpc/platforms/83xx/suspend.c linux-2= .6.32.38/arch/powerpc/platforms/83xx/suspend.c ---- linux-2.6.32.38/arch/powerpc/platforms/83xx/suspend.c 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/platforms/83xx/suspend.c 2011-04-17 15:= 56:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c linux-2= .6.32.39/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c 2011-04-17 15:= 56:45.000000000 -0400 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) return ret; } @@ -2903,9 +2903,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/8= 3xx/suspend.c linux-2.6.32.38 .valid =3D mpc83xx_suspend_valid, .begin =3D mpc83xx_suspend_begin, .enter =3D mpc83xx_suspend_enter, -diff -urNp linux-2.6.32.38/arch/powerpc/platforms/cell/iommu.c linux-2.6= .32.38/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.32.38/arch/powerpc/platforms/cell/iommu.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:56= :45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c linux-2.6= .32.39/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:56= :45.000000000 -0400 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc =20 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); @@ -2915,9 +2915,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/c= ell/iommu.c linux-2.6.32.38/a .alloc_coherent =3D dma_fixed_alloc_coherent, .free_coherent =3D dma_fixed_free_coherent, .map_sg =3D dma_fixed_map_sg, -diff -urNp linux-2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c linux= -2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 1= 5:56:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c linux= -2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 1= 5:56:45.000000000 -0400 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi return mask >=3D DMA_BIT_MASK(32); } @@ -2936,9 +2936,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/p= s3/system-bus.c linux-2.6.32. .alloc_coherent =3D ps3_alloc_coherent, .free_coherent =3D ps3_free_coherent, .map_sg =3D ps3_ioc0_map_sg, -diff -urNp linux-2.6.32.38/arch/powerpc/platforms/pseries/Kconfig linux-= 2.6.32.38/arch/powerpc/platforms/pseries/Kconfig ---- linux-2.6.32.38/arch/powerpc/platforms/pseries/Kconfig 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/powerpc/platforms/pseries/Kconfig 2011-04-17 15= :56:45.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig linux-= 2.6.32.39/arch/powerpc/platforms/pseries/Kconfig +--- linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig 2011-04-17 15= :56:45.000000000 -0400 @@ -2,6 +2,8 @@ config PPC_PSERIES depends on PPC64 && PPC_BOOK3S bool "IBM pSeries & new (POWER5-based) iSeries" @@ -2948,9 +2948,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/p= series/Kconfig linux-2.6.32.3 select PPC_I8259 select PPC_RTAS select RTAS_ERROR_LOGGING -diff -urNp linux-2.6.32.38/arch/s390/include/asm/elf.h linux-2.6.32.38/a= rch/s390/include/asm/elf.h ---- linux-2.6.32.38/arch/s390/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/s390/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/s390/include/asm/elf.h linux-2.6.32.39/a= rch/s390/include/asm/elf.h +--- linux-2.6.32.39/arch/s390/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/s390/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; that it will "exec", and that there is sufficient room for the brk. = */ #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) @@ -2965,9 +2965,9 @@ diff -urNp linux-2.6.32.38/arch/s390/include/asm/el= f.h linux-2.6.32.38/arch/s390 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. */ =20 -diff -urNp linux-2.6.32.38/arch/s390/include/asm/setup.h linux-2.6.32.38= /arch/s390/include/asm/setup.h ---- linux-2.6.32.38/arch/s390/include/asm/setup.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/s390/include/asm/setup.h 2011-04-17 15:56:45.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/s390/include/asm/setup.h linux-2.6.32.39= /arch/s390/include/asm/setup.h +--- linux-2.6.32.39/arch/s390/include/asm/setup.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/s390/include/asm/setup.h 2011-04-17 15:56:45.00= 0000000 -0400 @@ -50,13 +50,13 @@ extern unsigned long memory_end; void detect_memory_layout(struct mem_chunk chunk[]); =20 @@ -2984,9 +2984,9 @@ diff -urNp linux-2.6.32.38/arch/s390/include/asm/se= tup.h linux-2.6.32.38/arch/s3 #else #define s390_noexec (0) #endif -diff -urNp linux-2.6.32.38/arch/s390/include/asm/uaccess.h linux-2.6.32.= 38/arch/s390/include/asm/uaccess.h ---- linux-2.6.32.38/arch/s390/include/asm/uaccess.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/s390/include/asm/uaccess.h 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/s390/include/asm/uaccess.h linux-2.6.32.= 39/arch/s390/include/asm/uaccess.h +--- linux-2.6.32.39/arch/s390/include/asm/uaccess.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/s390/include/asm/uaccess.h 2011-04-17 15:56:45.= 000000000 -0400 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -3019,9 +3019,9 @@ diff -urNp linux-2.6.32.38/arch/s390/include/asm/ua= ccess.h linux-2.6.32.38/arch/ if (access_ok(VERIFY_READ, from, n)) n =3D __copy_from_user(to, from, n); else -diff -urNp linux-2.6.32.38/arch/s390/Kconfig linux-2.6.32.38/arch/s390/K= config ---- linux-2.6.32.38/arch/s390/Kconfig 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/arch/s390/Kconfig 2011-04-17 15:56:45.000000000 -040= 0 +diff -urNp linux-2.6.32.39/arch/s390/Kconfig linux-2.6.32.39/arch/s390/K= config +--- linux-2.6.32.39/arch/s390/Kconfig 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/arch/s390/Kconfig 2011-04-17 15:56:45.000000000 -040= 0 @@ -194,28 +194,26 @@ config AUDIT_ARCH =20 config S390_SWITCH_AMODE @@ -3059,9 +3059,9 @@ diff -urNp linux-2.6.32.38/arch/s390/Kconfig linux-= 2.6.32.38/arch/s390/Kconfig =20 comment "Code generation options" =20 -diff -urNp linux-2.6.32.38/arch/s390/kernel/module.c linux-2.6.32.38/arc= h/s390/kernel/module.c ---- linux-2.6.32.38/arch/s390/kernel/module.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/s390/kernel/module.c 2011-04-17 15:56:45.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/s390/kernel/module.c linux-2.6.32.39/arc= h/s390/kernel/module.c +--- linux-2.6.32.39/arch/s390/kernel/module.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/s390/kernel/module.c 2011-04-17 15:56:45.000000= 000 -0400 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, =20 /* Increase core size by size of got & plt and set start @@ -3133,9 +3133,9 @@ diff -urNp linux-2.6.32.38/arch/s390/kernel/module.= c linux-2.6.32.38/arch/s390/k rela->r_addend - loc; if (r_type =3D=3D R_390_GOTPC) *(unsigned int *) loc =3D val; -diff -urNp linux-2.6.32.38/arch/s390/kernel/setup.c linux-2.6.32.38/arch= /s390/kernel/setup.c ---- linux-2.6.32.38/arch/s390/kernel/setup.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/s390/kernel/setup.c 2011-04-17 15:56:45.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/s390/kernel/setup.c linux-2.6.32.39/arch= /s390/kernel/setup.c +--- linux-2.6.32.39/arch/s390/kernel/setup.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/s390/kernel/setup.c 2011-04-17 15:56:45.0000000= 00 -0400 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * early_param("mem", early_parse_mem); =20 @@ -3189,9 +3189,9 @@ diff -urNp linux-2.6.32.38/arch/s390/kernel/setup.c= linux-2.6.32.38/arch/s390/ke static void setup_addressing_mode(void) { if (s390_noexec) { -diff -urNp linux-2.6.32.38/arch/s390/mm/mmap.c linux-2.6.32.38/arch/s390= /mm/mmap.c ---- linux-2.6.32.38/arch/s390/mm/mmap.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/arch/s390/mm/mmap.c 2011-04-17 15:56:45.000000000 -0= 400 +diff -urNp linux-2.6.32.39/arch/s390/mm/mmap.c linux-2.6.32.39/arch/s390= /mm/mmap.c +--- linux-2.6.32.39/arch/s390/mm/mmap.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/arch/s390/mm/mmap.c 2011-04-17 15:56:45.000000000 -0= 400 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -3238,9 +3238,9 @@ diff -urNp linux-2.6.32.38/arch/s390/mm/mmap.c linu= x-2.6.32.38/arch/s390/mm/mmap mm->get_unmapped_area =3D s390_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.38/arch/score/include/asm/system.h linux-2.6.32.= 38/arch/score/include/asm/system.h ---- linux-2.6.32.38/arch/score/include/asm/system.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/score/include/asm/system.h 2011-04-17 15:56:45.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/score/include/asm/system.h linux-2.6.32.= 39/arch/score/include/asm/system.h +--- linux-2.6.32.39/arch/score/include/asm/system.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/score/include/asm/system.h 2011-04-17 15:56:45.= 000000000 -0400 @@ -17,7 +17,7 @@ do { \ #define finish_arch_switch(prev) do {} while (0) =20 @@ -3250,9 +3250,9 @@ diff -urNp linux-2.6.32.38/arch/score/include/asm/s= ystem.h linux-2.6.32.38/arch/ =20 #define mb() barrier() #define rmb() barrier() -diff -urNp linux-2.6.32.38/arch/score/kernel/process.c linux-2.6.32.38/a= rch/score/kernel/process.c ---- linux-2.6.32.38/arch/score/kernel/process.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/score/kernel/process.c 2011-04-17 15:56:45.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/score/kernel/process.c linux-2.6.32.39/a= rch/score/kernel/process.c +--- linux-2.6.32.39/arch/score/kernel/process.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/score/kernel/process.c 2011-04-17 15:56:45.0000= 00000 -0400 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru =20 return task_pt_regs(task)->cp0_epc; @@ -3262,9 +3262,9 @@ diff -urNp linux-2.6.32.38/arch/score/kernel/proces= s.c linux-2.6.32.38/arch/scor -{ - return sp; -} -diff -urNp linux-2.6.32.38/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.3= 8/arch/sh/boards/mach-hp6xx/pm.c ---- linux-2.6.32.38/arch/sh/boards/mach-hp6xx/pm.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/sh/boards/mach-hp6xx/pm.c 2011-04-17 15:56:45.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.3= 9/arch/sh/boards/mach-hp6xx/pm.c +--- linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c 2011-04-17 15:56:45.0= 00000000 -0400 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ return 0; } @@ -3274,9 +3274,9 @@ diff -urNp linux-2.6.32.38/arch/sh/boards/mach-hp6x= x/pm.c linux-2.6.32.38/arch/s .enter =3D hp6x0_pm_enter, .valid =3D suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.38/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.38/a= rch/sh/kernel/cpu/sh4/sq.c ---- linux-2.6.32.38/arch/sh/kernel/cpu/sh4/sq.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/sh/kernel/cpu/sh4/sq.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.39/a= rch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -3286,9 +3286,9 @@ diff -urNp linux-2.6.32.38/arch/sh/kernel/cpu/sh4/s= q.c linux-2.6.32.38/arch/sh/k .show =3D sq_sysfs_show, .store =3D sq_sysfs_store, }; -diff -urNp linux-2.6.32.38/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32= .38/arch/sh/kernel/cpu/shmobile/pm.c ---- linux-2.6.32.38/arch/sh/kernel/cpu/shmobile/pm.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/sh/kernel/cpu/shmobile/pm.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32= .39/arch/sh/kernel/cpu/shmobile/pm.c +--- linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c 2011-04-17 15:56:46= .000000000 -0400 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s return 0; } @@ -3298,9 +3298,9 @@ diff -urNp linux-2.6.32.38/arch/sh/kernel/cpu/shmob= ile/pm.c linux-2.6.32.38/arch .enter =3D sh_pm_enter, .valid =3D suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.38/arch/sh/kernel/kgdb.c linux-2.6.32.38/arch/sh= /kernel/kgdb.c ---- linux-2.6.32.38/arch/sh/kernel/kgdb.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/sh/kernel/kgdb.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/sh/kernel/kgdb.c linux-2.6.32.39/arch/sh= /kernel/kgdb.c +--- linux-2.6.32.39/arch/sh/kernel/kgdb.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/sh/kernel/kgdb.c 2011-04-17 15:56:46.000000000 = -0400 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) { } @@ -3310,9 +3310,9 @@ diff -urNp linux-2.6.32.38/arch/sh/kernel/kgdb.c li= nux-2.6.32.38/arch/sh/kernel/ /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr =3D { 0x3c, 0xc3 }, -diff -urNp linux-2.6.32.38/arch/sh/mm/mmap.c linux-2.6.32.38/arch/sh/mm/= mmap.c ---- linux-2.6.32.38/arch/sh/mm/mmap.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/arch/sh/mm/mmap.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/arch/sh/mm/mmap.c linux-2.6.32.39/arch/sh/mm/= mmap.c +--- linux-2.6.32.39/arch/sh/mm/mmap.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/arch/sh/mm/mmap.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str addr =3D PAGE_ALIGN(addr); =20 @@ -3387,9 +3387,9 @@ diff -urNp linux-2.6.32.38/arch/sh/mm/mmap.c linux-= 2.6.32.38/arch/sh/mm/mmap.c =20 bottomup: /* -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/atomic_64.h linux-2.6.= 32.38/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.32.38/arch/sparc/include/asm/atomic_64.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/atomic_64.h 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h linux-2.6.= 32.39/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h 2011-04-17 15:56:= 46.000000000 -0400 @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } =20 @@ -3540,9 +3540,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/a= tomic_64.h linux-2.6.32.38/ar } =20 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/dma-mapping.h linux-2.= 6.32.38/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.32.38/arch/sparc/include/asm/dma-mapping.h 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h linux-2.= 6.32.39/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:5= 6:46.000000000 -0400 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) #define dma_is_consistent(d, h) (1) @@ -3574,9 +3574,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/d= ma-mapping.h linux-2.6.32.38/ =20 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/elf_32.h linux-2.6.32.= 38/arch/sparc/include/asm/elf_32.h ---- linux-2.6.32.38/arch/sparc/include/asm/elf_32.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/elf_32.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/elf_32.h linux-2.6.32.= 39/arch/sparc/include/asm/elf_32.h +--- linux-2.6.32.39/arch/sparc/include/asm/elf_32.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/elf_32.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -116,6 +116,13 @@ typedef struct { =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3591,9 +3591,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/e= lf_32.h linux-2.6.32.38/arch/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspac= e on Sparc. */ -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/elf_64.h linux-2.6.32.= 38/arch/sparc/include/asm/elf_64.h ---- linux-2.6.32.38/arch/sparc/include/asm/elf_64.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/elf_64.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/elf_64.h linux-2.6.32.= 39/arch/sparc/include/asm/elf_64.h +--- linux-2.6.32.39/arch/sparc/include/asm/elf_64.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/elf_64.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3607,9 +3607,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/e= lf_64.h linux-2.6.32.38/arch/ =20 /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/pgtable_32.h linux-2.6= .32.38/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.32.38/arch/sparc/include/asm/pgtable_32.h 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h linux-2.6= .32.39/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:56= :46.000000000 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3641,9 +3641,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/p= gtable_32.h linux-2.6.32.38/a extern unsigned long page_kernel; =20 #ifdef MODULE -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.3= 2.38/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.32.38/arch/sparc/include/asm/pgtsrmmu.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.3= 2.39/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3658,9 +3658,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/p= gtsrmmu.h linux-2.6.32.38/arc #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_P= RIV | \ SRMMU_DIRTY | SRMMU_REF) =20 -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/spinlock_64.h linux-2.= 6.32.38/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.32.38/arch/sparc/include/asm/spinlock_64.h 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/spinlock_64.h 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h linux-2.= 6.32.39/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h 2011-04-17 15:5= 6:46.000000000 -0400 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw __asm__ __volatile__ ( "1: ldsw [%2], %0\n" @@ -3712,9 +3712,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/s= pinlock_64.h linux-2.6.32.38/ " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess_32.h linux-2.6= .32.38/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.32.38/arch/sparc/include/asm/uaccess_32.h 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h linux-2.6= .32.39/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:56= :46.000000000 -0400 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ =20 static inline unsigned long copy_to_user(void __user *to, const void *f= rom, unsigned long n) @@ -3766,9 +3766,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/u= access_32.h linux-2.6.32.38/a return __copy_user((__force void __user *) to, from, n); } =20 -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess_64.h linux-2.6= .32.38/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.32.38/arch/sparc/include/asm/uaccess_64.h 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h linux-2.6= .32.39/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:56= :46.000000000 -0400 @@ -9,6 +9,7 @@ #include #include @@ -3811,9 +3811,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/u= access_64.h linux-2.6.32.38/a if (unlikely(ret)) ret =3D copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess.h linux-2.6.32= .38/arch/sparc/include/asm/uaccess.h ---- linux-2.6.32.38/arch/sparc/include/asm/uaccess.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/include/asm/uaccess.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess.h linux-2.6.32= .39/arch/sparc/include/asm/uaccess.h +--- linux-2.6.32.39/arch/sparc/include/asm/uaccess.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/include/asm/uaccess.h 2011-04-17 15:56:46= .000000000 -0400 @@ -1,5 +1,13 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H @@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/u= access.h linux-2.6.32.38/arch #if defined(__sparc__) && defined(__arch64__) #include #else -diff -urNp linux-2.6.32.38/arch/sparc/kernel/iommu.c linux-2.6.32.38/arc= h/sparc/kernel/iommu.c ---- linux-2.6.32.38/arch/sparc/kernel/iommu.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/iommu.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/iommu.c linux-2.6.32.39/arc= h/sparc/kernel/iommu.c +--- linux-2.6.32.39/arch/sparc/kernel/iommu.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/iommu.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3849,9 +3849,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/iommu.= c linux-2.6.32.38/arch/sparc/ EXPORT_SYMBOL(dma_ops); =20 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.32.38/arch/sparc/kernel/ioport.c linux-2.6.32.38/ar= ch/sparc/kernel/ioport.c ---- linux-2.6.32.38/arch/sparc/kernel/ioport.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/ioport.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/ioport.c linux-2.6.32.39/ar= ch/sparc/kernel/ioport.c +--- linux-2.6.32.39/arch/sparc/kernel/ioport.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/ioport.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -3879,9 +3879,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/ioport= .c linux-2.6.32.38/arch/sparc .alloc_coherent =3D pci32_alloc_coherent, .free_coherent =3D pci32_free_coherent, .map_page =3D pci32_map_page, -diff -urNp linux-2.6.32.38/arch/sparc/kernel/kgdb_32.c linux-2.6.32.38/a= rch/sparc/kernel/kgdb_32.c ---- linux-2.6.32.38/arch/sparc/kernel/kgdb_32.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c linux-2.6.32.39/a= rch/sparc/kernel/kgdb_32.c +--- linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) { } @@ -3891,9 +3891,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/kgdb_3= 2.c linux-2.6.32.38/arch/spar /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr =3D { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.32.38/arch/sparc/kernel/kgdb_64.c linux-2.6.32.38/a= rch/sparc/kernel/kgdb_64.c ---- linux-2.6.32.38/arch/sparc/kernel/kgdb_64.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c linux-2.6.32.39/a= rch/sparc/kernel/kgdb_64.c +--- linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) { } @@ -3903,9 +3903,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/kgdb_6= 4.c linux-2.6.32.38/arch/spar /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr =3D { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.32.38/arch/sparc/kernel/Makefile linux-2.6.32.38/ar= ch/sparc/kernel/Makefile ---- linux-2.6.32.38/arch/sparc/kernel/Makefile 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/Makefile 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/Makefile linux-2.6.32.39/ar= ch/sparc/kernel/Makefile +--- linux-2.6.32.39/arch/sparc/kernel/Makefile 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/Makefile 2011-04-17 15:56:46.00000= 0000 -0400 @@ -3,7 +3,7 @@ # =20 @@ -3915,9 +3915,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/Makefi= le linux-2.6.32.38/arch/sparc =20 extra-y :=3D head_$(BITS).o extra-y +=3D init_task.o -diff -urNp linux-2.6.32.38/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.38= /arch/sparc/kernel/pci_sun4v.c ---- linux-2.6.32.38/arch/sparc/kernel/pci_sun4v.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.39= /arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3927,9 +3927,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/pci_su= n4v.c linux-2.6.32.38/arch/sp .alloc_coherent =3D dma_4v_alloc_coherent, .free_coherent =3D dma_4v_free_coherent, .map_page =3D dma_4v_map_page, -diff -urNp linux-2.6.32.38/arch/sparc/kernel/process_32.c linux-2.6.32.3= 8/arch/sparc/kernel/process_32.c ---- linux-2.6.32.38/arch/sparc/kernel/process_32.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/process_32.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/process_32.c linux-2.6.32.3= 9/arch/sparc/kernel/process_32.c +--- linux-2.6.32.39/arch/sparc/kernel/process_32.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/process_32.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) rw->ins[4], rw->ins[5], rw->ins[6], @@ -3965,9 +3965,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/proces= s_32.c linux-2.6.32.38/arch/s fp =3D rw->ins[6]; } while (++count < 16); printk("\n"); -diff -urNp linux-2.6.32.38/arch/sparc/kernel/process_64.c linux-2.6.32.3= 8/arch/sparc/kernel/process_64.c ---- linux-2.6.32.38/arch/sparc/kernel/process_64.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/process_64.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/process_64.c linux-2.6.32.3= 9/arch/sparc/kernel/process_64.c +--- linux-2.6.32.39/arch/sparc/kernel/process_64.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/process_64.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); @@ -4003,9 +4003,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/proces= s_64.c linux-2.6.32.38/arch/s (void *) gp->tpc, (void *) gp->o7, (void *) gp->i7, -diff -urNp linux-2.6.32.38/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32= .38/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.32.38/arch/sparc/kernel/sys_sparc_32.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32= .39/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:56:46= .000000000 -0400 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -4024,9 +4024,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/sys_sp= arc_32.c linux-2.6.32.38/arch return addr; addr =3D vmm->vm_end; if (flags & MAP_SHARED) -diff -urNp linux-2.6.32.38/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32= .38/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.32.38/arch/sparc/kernel/sys_sparc_64.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32= .39/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:56:46= .000000000 -0400 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -4174,9 +4174,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/sys_sp= arc_64.c linux-2.6.32.38/arch mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.38/arch/sparc/kernel/traps_32.c linux-2.6.32.38/= arch/sparc/kernel/traps_32.c ---- linux-2.6.32.38/arch/sparc/kernel/traps_32.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/traps_32.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/traps_32.c linux-2.6.32.39/= arch/sparc/kernel/traps_32.c +--- linux-2.6.32.39/arch/sparc/kernel/traps_32.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/traps_32.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_ count++ < 30 && (((unsigned long) rw) >=3D PAGE_OFFSET) && @@ -4186,9 +4186,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/traps_= 32.c linux-2.6.32.38/arch/spa (void *) rw->ins[7]); rw =3D (struct reg_window32 *)rw->ins[6]; } -diff -urNp linux-2.6.32.38/arch/sparc/kernel/traps_64.c linux-2.6.32.38/= arch/sparc/kernel/traps_64.c ---- linux-2.6.32.38/arch/sparc/kernel/traps_64.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/traps_64.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/traps_64.c linux-2.6.32.39/= arch/sparc/kernel/traps_64.c +--- linux-2.6.32.39/arch/sparc/kernel/traps_64.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/traps_64.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_ i + 1, p->trapstack[i].tstate, p->trapstack[i].tpc, @@ -4298,9 +4298,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/traps_= 64.c linux-2.6.32.38/arch/spa (void *) rw->ins[7]); =20 rw =3D kernel_stack_up(rw); -diff -urNp linux-2.6.32.38/arch/sparc/kernel/unaligned_64.c linux-2.6.32= .38/arch/sparc/kernel/unaligned_64.c ---- linux-2.6.32.38/arch/sparc/kernel/unaligned_64.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c linux-2.6.32= .39/arch/sparc/kernel/unaligned_64.c +--- linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:56:46= .000000000 -0400 @@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs if (count < 5) { last_time =3D jiffies; @@ -4310,9 +4310,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/unalig= ned_64.c linux-2.6.32.38/arch regs->tpc, (void *) regs->tpc); } } -diff -urNp linux-2.6.32.38/arch/sparc/lib/atomic_64.S linux-2.6.32.38/ar= ch/sparc/lib/atomic_64.S ---- linux-2.6.32.38/arch/sparc/lib/atomic_64.S 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/sparc/lib/atomic_64.S 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/lib/atomic_64.S linux-2.6.32.39/ar= ch/sparc/lib/atomic_64.S +--- linux-2.6.32.39/arch/sparc/lib/atomic_64.S 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/sparc/lib/atomic_64.S 2011-04-17 15:56:46.00000= 0000 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 =3D increment, %o1 =3D atomic_ptr */ BACKOFF_SETUP(%o2) @@ -4547,9 +4547,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/lib/atomic_64= .S linux-2.6.32.38/arch/sparc casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.32.38/arch/sparc/lib/ksyms.c linux-2.6.32.38/arch/s= parc/lib/ksyms.c ---- linux-2.6.32.38/arch/sparc/lib/ksyms.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/sparc/lib/ksyms.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/sparc/lib/ksyms.c linux-2.6.32.39/arch/s= parc/lib/ksyms.c +--- linux-2.6.32.39/arch/sparc/lib/ksyms.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/sparc/lib/ksyms.c 2011-04-17 15:56:46.000000000= -0400 @@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write); =20 /* Atomic counter implementation. */ @@ -4568,9 +4568,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/lib/ksyms.c l= inux-2.6.32.38/arch/sparc/lib EXPORT_SYMBOL(atomic64_sub_ret); =20 /* Atomic bit operations. */ -diff -urNp linux-2.6.32.38/arch/sparc/lib/rwsem_64.S linux-2.6.32.38/arc= h/sparc/lib/rwsem_64.S ---- linux-2.6.32.38/arch/sparc/lib/rwsem_64.S 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/sparc/lib/rwsem_64.S 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/lib/rwsem_64.S linux-2.6.32.39/arc= h/sparc/lib/rwsem_64.S +--- linux-2.6.32.39/arch/sparc/lib/rwsem_64.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/sparc/lib/rwsem_64.S 2011-04-17 15:56:46.000000= 000 -0400 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -4669,9 +4669,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/lib/rwsem_64.= S linux-2.6.32.38/arch/sparc/ cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.32.38/arch/sparc/Makefile linux-2.6.32.38/arch/spar= c/Makefile ---- linux-2.6.32.38/arch/sparc/Makefile 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/arch/sparc/Makefile 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/arch/sparc/Makefile linux-2.6.32.39/arch/spar= c/Makefile +--- linux-2.6.32.39/arch/sparc/Makefile 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/arch/sparc/Makefile 2011-04-17 15:56:46.000000000 -0= 400 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) +=3D arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -4681,9 +4681,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/Makefile linu= x-2.6.32.38/arch/sparc/Makefi VMLINUX_MAIN +=3D $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN +=3D $(drivers-y) $(net-y) =20 -diff -urNp linux-2.6.32.38/arch/sparc/mm/fault_32.c linux-2.6.32.38/arch= /sparc/mm/fault_32.c ---- linux-2.6.32.38/arch/sparc/mm/fault_32.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/sparc/mm/fault_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/mm/fault_32.c linux-2.6.32.39/arch= /sparc/mm/fault_32.c +--- linux-2.6.32.39/arch/sparc/mm/fault_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/sparc/mm/fault_32.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -21,6 +21,9 @@ #include #include @@ -4987,9 +4987,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/fault_32.c= linux-2.6.32.38/arch/sparc/m /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.32.38/arch/sparc/mm/fault_64.c linux-2.6.32.38/arch= /sparc/mm/fault_64.c ---- linux-2.6.32.38/arch/sparc/mm/fault_64.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/sparc/mm/fault_64.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/mm/fault_64.c linux-2.6.32.39/arch= /sparc/mm/fault_64.c +--- linux-2.6.32.39/arch/sparc/mm/fault_64.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/sparc/mm/fault_64.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -20,6 +20,9 @@ #include #include @@ -5496,9 +5496,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/fault_64.c= linux-2.6.32.38/arch/sparc/m /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.32.38/arch/sparc/mm/hugetlbpage.c linux-2.6.32.38/a= rch/sparc/mm/hugetlbpage.c ---- linux-2.6.32.38/arch/sparc/mm/hugetlbpage.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c linux-2.6.32.39/a= rch/sparc/mm/hugetlbpage.c +--- linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -69,7 +69,7 @@ full_search: } return -ENOMEM; @@ -5558,9 +5558,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/hugetlbpag= e.c linux-2.6.32.38/arch/spar return addr; } if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area) -diff -urNp linux-2.6.32.38/arch/sparc/mm/init_32.c linux-2.6.32.38/arch/= sparc/mm/init_32.c ---- linux-2.6.32.38/arch/sparc/mm/init_32.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/sparc/mm/init_32.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/sparc/mm/init_32.c linux-2.6.32.39/arch/= sparc/mm/init_32.c +--- linux-2.6.32.39/arch/sparc/mm/init_32.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/sparc/mm/init_32.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -5595,9 +5595,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/init_32.c = linux-2.6.32.38/arch/sparc/mm protection_map[12] =3D PAGE_READONLY; protection_map[13] =3D PAGE_READONLY; protection_map[14] =3D PAGE_SHARED; -diff -urNp linux-2.6.32.38/arch/sparc/mm/Makefile linux-2.6.32.38/arch/s= parc/mm/Makefile ---- linux-2.6.32.38/arch/sparc/mm/Makefile 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/sparc/mm/Makefile 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/sparc/mm/Makefile linux-2.6.32.39/arch/s= parc/mm/Makefile +--- linux-2.6.32.39/arch/sparc/mm/Makefile 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/sparc/mm/Makefile 2011-04-17 15:56:46.000000000= -0400 @@ -2,7 +2,7 @@ # =20 @@ -5607,9 +5607,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/Makefile l= inux-2.6.32.38/arch/sparc/mm/ =20 obj-$(CONFIG_SPARC64) +=3D ultra.o tlb.o tsb.o obj-y +=3D fault_$(BITS).o -diff -urNp linux-2.6.32.38/arch/sparc/mm/srmmu.c linux-2.6.32.38/arch/sp= arc/mm/srmmu.c ---- linux-2.6.32.38/arch/sparc/mm/srmmu.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/sparc/mm/srmmu.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/sparc/mm/srmmu.c linux-2.6.32.39/arch/sp= arc/mm/srmmu.c +--- linux-2.6.32.39/arch/sparc/mm/srmmu.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/sparc/mm/srmmu.c 2011-04-17 15:56:46.000000000 = -0400 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED =3D pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -5624,9 +5624,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/srmmu.c li= nux-2.6.32.38/arch/sparc/mm/s BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel =3D pgprot_val(SRMMU_PAGE_KERNEL); =20 -diff -urNp linux-2.6.32.38/arch/um/include/asm/kmap_types.h linux-2.6.32= .38/arch/um/include/asm/kmap_types.h ---- linux-2.6.32.38/arch/um/include/asm/kmap_types.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/um/include/asm/kmap_types.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/um/include/asm/kmap_types.h linux-2.6.32= .39/arch/um/include/asm/kmap_types.h +--- linux-2.6.32.39/arch/um/include/asm/kmap_types.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/um/include/asm/kmap_types.h 2011-04-17 15:56:46= .000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -5635,9 +5635,9 @@ diff -urNp linux-2.6.32.38/arch/um/include/asm/kmap= _types.h linux-2.6.32.38/arch KM_TYPE_NR }; =20 -diff -urNp linux-2.6.32.38/arch/um/include/asm/page.h linux-2.6.32.38/ar= ch/um/include/asm/page.h ---- linux-2.6.32.38/arch/um/include/asm/page.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/um/include/asm/page.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/um/include/asm/page.h linux-2.6.32.39/ar= ch/um/include/asm/page.h +--- linux-2.6.32.39/arch/um/include/asm/page.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/um/include/asm/page.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -5648,9 +5648,9 @@ diff -urNp linux-2.6.32.38/arch/um/include/asm/page= .h linux-2.6.32.38/arch/um/in #ifndef __ASSEMBLY__ =20 struct page; -diff -urNp linux-2.6.32.38/arch/um/kernel/process.c linux-2.6.32.38/arch= /um/kernel/process.c ---- linux-2.6.32.38/arch/um/kernel/process.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/um/kernel/process.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/um/kernel/process.c linux-2.6.32.39/arch= /um/kernel/process.c +--- linux-2.6.32.39/arch/um/kernel/process.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/um/kernel/process.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -393,22 +393,6 @@ int singlestepping(void * t) return 2; } @@ -5674,9 +5674,9 @@ diff -urNp linux-2.6.32.38/arch/um/kernel/process.c= linux-2.6.32.38/arch/um/kern unsigned long get_wchan(struct task_struct *p) { unsigned long stack_page, sp, ip; -diff -urNp linux-2.6.32.38/arch/um/sys-i386/syscalls.c linux-2.6.32.38/a= rch/um/sys-i386/syscalls.c ---- linux-2.6.32.38/arch/um/sys-i386/syscalls.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/um/sys-i386/syscalls.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/um/sys-i386/syscalls.c linux-2.6.32.39/a= rch/um/sys-i386/syscalls.c +--- linux-2.6.32.39/arch/um/sys-i386/syscalls.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/um/sys-i386/syscalls.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -5699,9 +5699,9 @@ diff -urNp linux-2.6.32.38/arch/um/sys-i386/syscall= s.c linux-2.6.32.38/arch/um/s /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.32.38/arch/x86/boot/bitops.h linux-2.6.32.38/arch/x= 86/boot/bitops.h ---- linux-2.6.32.38/arch/x86/boot/bitops.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/boot/bitops.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/bitops.h linux-2.6.32.39/arch/x= 86/boot/bitops.h +--- linux-2.6.32.39/arch/x86/boot/bitops.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/boot/bitops.h 2011-04-17 15:56:46.000000000= -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int=20 u8 v; const u32 *p =3D (const u32 *)addr; @@ -5720,9 +5720,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/bitops.h l= inux-2.6.32.38/arch/x86/boot/ } =20 #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.32.38/arch/x86/boot/boot.h linux-2.6.32.38/arch/x86= /boot/boot.h ---- linux-2.6.32.38/arch/x86/boot/boot.h 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/arch/x86/boot/boot.h 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/boot.h linux-2.6.32.39/arch/x86= /boot/boot.h +--- linux-2.6.32.39/arch/x86/boot/boot.h 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/arch/x86/boot/boot.h 2011-04-17 15:56:46.000000000 -= 0400 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -5741,9 +5741,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/boot.h lin= ux-2.6.32.38/arch/x86/boot/bo : "=3Dqm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/head_32.S linux-2.6.= 32.38/arch/x86/boot/compressed/head_32.S ---- linux-2.6.32.38/arch/x86/boot/compressed/head_32.S 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/boot/compressed/head_32.S 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/head_32.S linux-2.6.= 32.39/arch/x86/boot/compressed/head_32.S +--- linux-2.6.32.39/arch/x86/boot/compressed/head_32.S 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/boot/compressed/head_32.S 2011-04-17 15:56:= 46.000000000 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5772,9 +5772,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed= /head_32.S linux-2.6.32.38/ar addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/head_64.S linux-2.6.= 32.38/arch/x86/boot/compressed/head_64.S ---- linux-2.6.32.38/arch/x86/boot/compressed/head_64.S 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/boot/compressed/head_64.S 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/head_64.S linux-2.6.= 32.39/arch/x86/boot/compressed/head_64.S +--- linux-2.6.32.39/arch/x86/boot/compressed/head_64.S 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/boot/compressed/head_64.S 2011-04-17 15:56:= 46.000000000 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5793,9 +5793,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed= /head_64.S linux-2.6.32.38/ar #endif =20 /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/misc.c linux-2.6.32.= 38/arch/x86/boot/compressed/misc.c ---- linux-2.6.32.38/arch/x86/boot/compressed/misc.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/boot/compressed/misc.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/misc.c linux-2.6.32.= 39/arch/x86/boot/compressed/misc.c +--- linux-2.6.32.39/arch/x86/boot/compressed/misc.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/boot/compressed/misc.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -5814,9 +5814,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed= /misc.c linux-2.6.32.38/arch/ error("Wrong destination address"); #endif =20 -diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/mkpiggy.c linux-2.6.= 32.38/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.32.38/arch/x86/boot/compressed/mkpiggy.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/boot/compressed/mkpiggy.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c linux-2.6.= 32.39/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) =20 offs =3D (olen > ilen) ? olen - ilen : 0; @@ -5826,9 +5826,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed= /mkpiggy.c linux-2.6.32.38/ar offs =3D (offs+4095) & ~4095; /* Round to a 4K boundary */ =20 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/relocs.c linux-2.6.3= 2.38/arch/x86/boot/compressed/relocs.c ---- linux-2.6.32.38/arch/x86/boot/compressed/relocs.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/boot/compressed/relocs.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/relocs.c linux-2.6.3= 2.39/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32.39/arch/x86/boot/compressed/relocs.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/boot/compressed/relocs.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #include @@ -6029,9 +6029,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed= /relocs.c linux-2.6.32.38/arc read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.32.38/arch/x86/boot/cpucheck.c linux-2.6.32.38/arch= /x86/boot/cpucheck.c ---- linux-2.6.32.38/arch/x86/boot/cpucheck.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/boot/cpucheck.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/cpucheck.c linux-2.6.32.39/arch= /x86/boot/cpucheck.c +--- linux-2.6.32.39/arch/x86/boot/cpucheck.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/boot/cpucheck.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw =3D -1, fsw =3D -1; u32 cr0; @@ -6127,9 +6127,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/cpucheck.c= linux-2.6.32.38/arch/x86/boo =20 err =3D check_flags(); } -diff -urNp linux-2.6.32.38/arch/x86/boot/header.S linux-2.6.32.38/arch/x= 86/boot/header.S ---- linux-2.6.32.38/arch/x86/boot/header.S 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/boot/header.S 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/header.S linux-2.6.32.39/arch/x= 86/boot/header.S +--- linux-2.6.32.39/arch/x86/boot/header.S 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/boot/header.S 2011-04-17 15:56:46.000000000= -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -6139,9 +6139,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/header.S l= inux-2.6.32.38/arch/x86/boot/ =20 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.32.38/arch/x86/boot/memory.c linux-2.6.32.38/arch/x= 86/boot/memory.c ---- linux-2.6.32.38/arch/x86/boot/memory.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/boot/memory.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/memory.c linux-2.6.32.39/arch/x= 86/boot/memory.c +--- linux-2.6.32.39/arch/x86/boot/memory.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/boot/memory.c 2011-04-17 15:56:46.000000000= -0400 @@ -19,7 +19,7 @@ =20 static int detect_memory_e820(void) @@ -6151,9 +6151,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/memory.c l= inux-2.6.32.38/arch/x86/boot/ struct biosregs ireg, oreg; struct e820entry *desc =3D boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-2.6.32.38/arch/x86/boot/video.c linux-2.6.32.38/arch/x8= 6/boot/video.c ---- linux-2.6.32.38/arch/x86/boot/video.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/boot/video.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/video.c linux-2.6.32.39/arch/x8= 6/boot/video.c +--- linux-2.6.32.39/arch/x86/boot/video.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/boot/video.c 2011-04-17 15:56:46.000000000 = -0400 @@ -90,7 +90,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -6163,9 +6163,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/video.c li= nux-2.6.32.38/arch/x86/boot/v int key; unsigned int v; =20 -diff -urNp linux-2.6.32.38/arch/x86/boot/video-vesa.c linux-2.6.32.38/ar= ch/x86/boot/video-vesa.c ---- linux-2.6.32.38/arch/x86/boot/video-vesa.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/boot/video-vesa.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/boot/video-vesa.c linux-2.6.32.39/ar= ch/x86/boot/video-vesa.c +--- linux-2.6.32.39/arch/x86/boot/video-vesa.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/boot/video-vesa.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) =20 boot_params.screen_info.vesapm_seg =3D oreg.es; @@ -6174,9 +6174,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/video-vesa= .c linux-2.6.32.38/arch/x86/b } =20 /* -diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32_aout.c linux-2.6.32.38/arc= h/x86/ia32/ia32_aout.c ---- linux-2.6.32.38/arch/x86/ia32/ia32_aout.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/ia32/ia32_aout.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32_aout.c linux-2.6.32.39/arc= h/x86/ia32/ia32_aout.c +--- linux-2.6.32.39/arch/x86/ia32/ia32_aout.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/ia32/ia32_aout.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st unsigned long dump_start, dump_size; struct user32 dump; @@ -6199,9 +6199,9 @@ diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32_aout.= c linux-2.6.32.38/arch/x86/ia end_coredump: set_fs(fs); return has_dumped; -diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32entry.S linux-2.6.32.38/arc= h/x86/ia32/ia32entry.S ---- linux-2.6.32.38/arch/x86/ia32/ia32entry.S 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/ia32/ia32entry.S 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arc= h/x86/ia32/ia32entry.S +--- linux-2.6.32.39/arch/x86/ia32/ia32entry.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/ia32/ia32entry.S 2011-04-17 15:56:46.000000= 000 -0400 @@ -13,6 +13,7 @@ #include =09 #include @@ -6339,9 +6339,9 @@ diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32entry.= S linux-2.6.32.38/arch/x86/ia /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: -diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32_signal.c linux-2.6.32.38/a= rch/x86/ia32/ia32_signal.c ---- linux-2.6.32.38/arch/x86/ia32/ia32_signal.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/ia32/ia32_signal.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32_signal.c linux-2.6.32.39/a= rch/x86/ia32/ia32_signal.c +--- linux-2.6.32.39/arch/x86/ia32/ia32_signal.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/ia32/ia32_signal.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct=20 sp -=3D frame_size; /* Align the stack pointer according to the i386 ABI, @@ -6391,9 +6391,9 @@ diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32_signa= l.c linux-2.6.32.38/arch/x86/ } put_user_catch(err); =20 if (err) -diff -urNp linux-2.6.32.38/arch/x86/include/asm/alternative.h linux-2.6.= 32.38/arch/x86/include/asm/alternative.h ---- linux-2.6.32.38/arch/x86/include/asm/alternative.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/alternative.h 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/alternative.h linux-2.6.= 32.39/arch/x86/include/asm/alternative.h +--- linux-2.6.32.39/arch/x86/include/asm/alternative.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/alternative.h 2011-04-17 15:56:= 46.000000000 -0400 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -6403,9 +6403,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/alt= ernative.h linux-2.6.32.38/ar "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" =20 -diff -urNp linux-2.6.32.38/arch/x86/include/asm/apm.h linux-2.6.32.38/ar= ch/x86/include/asm/apm.h ---- linux-2.6.32.38/arch/x86/include/asm/apm.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/apm.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/apm.h linux-2.6.32.39/ar= ch/x86/include/asm/apm.h +--- linux-2.6.32.39/arch/x86/include/asm/apm.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/apm.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -6424,9 +6424,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/apm= .h linux-2.6.32.38/arch/x86/i "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.32.38/arch/x86/include/asm/atomic_32.h linux-2.6.32= .38/arch/x86/include/asm/atomic_32.h ---- linux-2.6.32.38/arch/x86/include/asm/atomic_32.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/atomic_32.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32= .39/arch/x86/include/asm/atomic_32.h +--- linux-2.6.32.39/arch/x86/include/asm/atomic_32.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/atomic_32.h 2011-04-17 15:56:46= .000000000 -0400 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } =20 @@ -6762,9 +6762,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/ato= mic_32.h linux-2.6.32.38/arch #define ATOMIC64_INIT(val) { (val) } =20 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); -diff -urNp linux-2.6.32.38/arch/x86/include/asm/atomic_64.h linux-2.6.32= .38/arch/x86/include/asm/atomic_64.h ---- linux-2.6.32.38/arch/x86/include/asm/atomic_64.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/atomic_64.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32= .39/arch/x86/include/asm/atomic_64.h +--- linux-2.6.32.39/arch/x86/include/asm/atomic_64.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/atomic_64.h 2011-04-17 15:56:46= .000000000 -0400 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } =20 @@ -7368,9 +7368,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/ato= mic_64.h linux-2.6.32.38/arch } =20 /** -diff -urNp linux-2.6.32.38/arch/x86/include/asm/bitops.h linux-2.6.32.38= /arch/x86/include/asm/bitops.h ---- linux-2.6.32.38/arch/x86/include/asm/bitops.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/bitops.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/bitops.h linux-2.6.32.39= /arch/x86/include/asm/bitops.h +--- linux-2.6.32.39/arch/x86/include/asm/bitops.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/bitops.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -38,7 +38,7 @@ * a mask operation on a byte. */ @@ -7380,9 +7380,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/bit= ops.h linux-2.6.32.38/arch/x8 #define CONST_MASK(nr) (1 << ((nr) & 7)) =20 /** -diff -urNp linux-2.6.32.38/arch/x86/include/asm/boot.h linux-2.6.32.38/a= rch/x86/include/asm/boot.h ---- linux-2.6.32.38/arch/x86/include/asm/boot.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/boot.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/boot.h linux-2.6.32.39/a= rch/x86/include/asm/boot.h +--- linux-2.6.32.39/arch/x86/include/asm/boot.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/boot.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -11,10 +11,15 @@ #include =20 @@ -7400,9 +7400,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/boo= t.h linux-2.6.32.38/arch/x86/ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.32.38/arch/x86/include/asm/cacheflush.h linux-2.6.3= 2.38/arch/x86/include/asm/cacheflush.h ---- linux-2.6.32.38/arch/x86/include/asm/cacheflush.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/cacheflush.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/cacheflush.h linux-2.6.3= 2.39/arch/x86/include/asm/cacheflush.h +--- linux-2.6.32.39/arch/x86/include/asm/cacheflush.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/cacheflush.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) static inline unsigned long get_page_memtype(struct page *pg) { @@ -7421,9 +7421,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/cac= heflush.h linux-2.6.32.38/arc ClearPageUncached(pg); ClearPageWC(pg); break; -diff -urNp linux-2.6.32.38/arch/x86/include/asm/cache.h linux-2.6.32.38/= arch/x86/include/asm/cache.h ---- linux-2.6.32.38/arch/x86/include/asm/cache.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/cache.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/cache.h linux-2.6.32.39/= arch/x86/include/asm/cache.h +--- linux-2.6.32.39/arch/x86/include/asm/cache.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/cache.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) =20 @@ -7432,9 +7432,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/cac= he.h linux-2.6.32.38/arch/x86 =20 #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/checksum_32.h linux-2.6.= 32.38/arch/x86/include/asm/checksum_32.h ---- linux-2.6.32.38/arch/x86/include/asm/checksum_32.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/checksum_32.h 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/checksum_32.h linux-2.6.= 32.39/arch/x86/include/asm/checksum_32.h +--- linux-2.6.32.39/arch/x86/include/asm/checksum_32.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/checksum_32.h 2011-04-17 15:56:= 46.000000000 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -7468,9 +7468,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/che= cksum_32.h linux-2.6.32.38/ar len, sum, NULL, err_ptr); =20 if (len) -diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc_defs.h linux-2.6.32= .38/arch/x86/include/asm/desc_defs.h ---- linux-2.6.32.38/arch/x86/include/asm/desc_defs.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/desc_defs.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/desc_defs.h linux-2.6.32= .39/arch/x86/include/asm/desc_defs.h +--- linux-2.6.32.39/arch/x86/include/asm/desc_defs.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/desc_defs.h 2011-04-17 15:56:46= .000000000 -0400 @@ -31,6 +31,12 @@ struct desc_struct { unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; @@ -7484,9 +7484,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c_defs.h linux-2.6.32.38/arch }; } __attribute__((packed)); =20 -diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/a= rch/x86/include/asm/desc.h ---- linux-2.6.32.38/arch/x86/include/asm/desc.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/desc.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/desc.h linux-2.6.32.39/a= rch/x86/include/asm/desc.h +--- linux-2.6.32.39/arch/x86/include/asm/desc.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/desc.h 2011-04-23 12:56:10.0000= 00000 -0400 @@ -4,6 +4,7 @@ #include #include @@ -7541,7 +7541,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c.h linux-2.6.32.38/arch/x86/ } =20 #endif -@@ -115,19 +118,24 @@ static inline void paravirt_free_ldt(str +@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(str static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate) { @@ -7559,14 +7559,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/de= sc.h linux-2.6.32.38/arch/x86/ } =20 static inline void native_write_gdt_entry(struct desc_struct *gdt, int = entry, - const void *desc, int type) - { - unsigned int size; -+ - switch (type) { - case DESC_TSS: - size =3D sizeof(tss_desc); -@@ -139,7 +147,10 @@ static inline void native_write_gdt_entr +@@ -139,7 +146,10 @@ static inline void native_write_gdt_entr size =3D sizeof(struct desc_struct); break; } @@ -7577,7 +7570,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c.h linux-2.6.32.38/arch/x86/ } =20 static inline void pack_descriptor(struct desc_struct *desc, unsigned l= ong base, -@@ -211,7 +222,9 @@ static inline void native_set_ldt(const=20 +@@ -211,7 +221,9 @@ static inline void native_set_ldt(const=20 =20 static inline void native_load_tr_desc(void) { @@ -7587,7 +7580,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c.h linux-2.6.32.38/arch/x86/ } =20 static inline void native_load_gdt(const struct desc_ptr *dtr) -@@ -246,8 +259,10 @@ static inline void native_load_tls(struc +@@ -246,8 +258,10 @@ static inline void native_load_tls(struc unsigned int i; struct desc_struct *gdt =3D get_cpu_gdt_table(cpu); =20 @@ -7598,7 +7591,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c.h linux-2.6.32.38/arch/x86/ } =20 #define _LDT_empty(info) \ -@@ -309,7 +324,7 @@ static inline void set_desc_limit(struct +@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct desc->limit =3D (limit >> 16) & 0xf; } =20 @@ -7607,7 +7600,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c.h linux-2.6.32.38/arch/x86/ unsigned dpl, unsigned ist, unsigned seg) { gate_desc s; -@@ -327,7 +342,7 @@ static inline void _set_gate(int gate, u +@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, u * Pentium F0 0F bugfix can have resulted in the mapped * IDT being write-protected. */ @@ -7616,7 +7609,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c.h linux-2.6.32.38/arch/x86/ { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); -@@ -356,19 +371,19 @@ static inline void alloc_intr_gate(unsig +@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsig /* * This routine sets up an interrupt gate at directory privilege level = 3. */ @@ -7639,7 +7632,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c.h linux-2.6.32.38/arch/x86/ { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); -@@ -377,19 +392,31 @@ static inline void set_trap_gate(unsigne +@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigne static inline void set_task_gate(unsigned int n, unsigned int gdt_entry= ) { BUG_ON((unsigned)n > 0xFF); @@ -7674,9 +7667,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/des= c.h linux-2.6.32.38/arch/x86/ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/device.h linux-2.6.32.38= /arch/x86/include/asm/device.h ---- linux-2.6.32.38/arch/x86/include/asm/device.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/device.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/device.h linux-2.6.32.39= /arch/x86/include/asm/device.h +--- linux-2.6.32.39/arch/x86/include/asm/device.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/device.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -7686,9 +7679,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/dev= ice.h linux-2.6.32.38/arch/x8 #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/dma-mapping.h linux-2.6.= 32.38/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.32.38/arch/x86/include/asm/dma-mapping.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h linux-2.6.= 32.39/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:56:= 46.000000000 -0400 @@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -7728,9 +7721,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/dma= -mapping.h linux-2.6.32.38/ar =20 WARN_ON(irqs_disabled()); /* for portability */ =20 -diff -urNp linux-2.6.32.38/arch/x86/include/asm/e820.h linux-2.6.32.38/a= rch/x86/include/asm/e820.h ---- linux-2.6.32.38/arch/x86/include/asm/e820.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/e820.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/e820.h linux-2.6.32.39/a= rch/x86/include/asm/e820.h +--- linux-2.6.32.39/arch/x86/include/asm/e820.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/e820.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me #define ISA_END_ADDRESS 0x100000 #define is_ISA_range(s, e) ((s) >=3D ISA_START_ADDRESS && (e) < ISA_END= _ADDRESS) @@ -7740,9 +7733,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/e82= 0.h linux-2.6.32.38/arch/x86/ #define BIOS_END 0x00100000 =20 #ifdef __KERNEL__ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/elf.h linux-2.6.32.38/ar= ch/x86/include/asm/elf.h ---- linux-2.6.32.38/arch/x86/include/asm/elf.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/elf.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/elf.h linux-2.6.32.39/ar= ch/x86/include/asm/elf.h +--- linux-2.6.32.39/arch/x86/include/asm/elf.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/elf.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -257,7 +257,25 @@ extern int force_personality32; the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -7796,9 +7789,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/elf= .h linux-2.6.32.38/arch/x86/i -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/futex.h linux-2.6.32.38/= arch/x86/include/asm/futex.h ---- linux-2.6.32.38/arch/x86/include/asm/futex.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/futex.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/futex.h linux-2.6.32.39/= arch/x86/include/asm/futex.h +--- linux-2.6.32.39/arch/x86/include/asm/futex.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/futex.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -12,16 +12,18 @@ #include =20 @@ -7874,9 +7867,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/fut= ex.h linux-2.6.32.38/arch/x86 : "i" (-EFAULT), "r" (newval), "0" (oldval) : "memory" ); -diff -urNp linux-2.6.32.38/arch/x86/include/asm/i387.h linux-2.6.32.38/a= rch/x86/include/asm/i387.h ---- linux-2.6.32.38/arch/x86/include/asm/i387.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/i387.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/i387.h linux-2.6.32.39/a= rch/x86/include/asm/i387.h +--- linux-2.6.32.39/arch/x86/include/asm/i387.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/i387.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc { int err; @@ -7926,9 +7919,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/i38= 7.h linux-2.6.32.38/arch/x86/ else clts(); } -diff -urNp linux-2.6.32.38/arch/x86/include/asm/io_32.h linux-2.6.32.38/= arch/x86/include/asm/io_32.h ---- linux-2.6.32.38/arch/x86/include/asm/io_32.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/io_32.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/io_32.h linux-2.6.32.39/= arch/x86/include/asm/io_32.h +--- linux-2.6.32.39/arch/x86/include/asm/io_32.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/io_32.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -3,6 +3,7 @@ =20 #include @@ -7955,9 +7948,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/io_= 32.h linux-2.6.32.38/arch/x86 #include =20 #include -diff -urNp linux-2.6.32.38/arch/x86/include/asm/io_64.h linux-2.6.32.38/= arch/x86/include/asm/io_64.h ---- linux-2.6.32.38/arch/x86/include/asm/io_64.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/io_64.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/io_64.h linux-2.6.32.39/= arch/x86/include/asm/io_64.h +--- linux-2.6.32.39/arch/x86/include/asm/io_64.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/io_64.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -140,6 +140,17 @@ __OUTS(l) =20 #include @@ -7976,9 +7969,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/io_= 64.h linux-2.6.32.38/arch/x86 #include =20 void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.32.38/arch/x86/include/asm/iommu.h linux-2.6.32.38/= arch/x86/include/asm/iommu.h ---- linux-2.6.32.38/arch/x86/include/asm/iommu.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/iommu.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/iommu.h linux-2.6.32.39/= arch/x86/include/asm/iommu.h +--- linux-2.6.32.39/arch/x86/include/asm/iommu.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/iommu.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -3,7 +3,7 @@ =20 extern void pci_iommu_shutdown(void); @@ -7988,9 +7981,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/iom= mu.h linux-2.6.32.38/arch/x86 extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.32.38/arch/x86/include/asm/irqflags.h linux-2.6.32.= 38/arch/x86/include/asm/irqflags.h ---- linux-2.6.32.38/arch/x86/include/asm/irqflags.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/irqflags.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/irqflags.h linux-2.6.32.= 39/arch/x86/include/asm/irqflags.h +--- linux-2.6.32.39/arch/x86/include/asm/irqflags.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/irqflags.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ sti; \ sysexit @@ -8003,9 +7996,28 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/ir= qflags.h linux-2.6.32.38/arch/ #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-2.6.32.38/arch/x86/include/asm/kvm_host.h linux-2.6.32.= 38/arch/x86/include/asm/kvm_host.h ---- linux-2.6.32.38/arch/x86/include/asm/kvm_host.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/kvm_host.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/kprobes.h linux-2.6.32.3= 9/arch/x86/include/asm/kprobes.h +--- linux-2.6.32.39/arch/x86/include/asm/kprobes.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/kprobes.h 2011-04-23 12:56:12.0= 00000000 -0400 +@@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t; + #define BREAKPOINT_INSTRUCTION 0xcc + #define RELATIVEJUMP_INSTRUCTION 0xe9 + #define MAX_INSN_SIZE 16 +-#define MAX_STACK_SIZE 64 +-#define MIN_STACK_SIZE(ADDR) \ +- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \ +- THREAD_SIZE - (unsigned long)(ADDR))) \ +- ? (MAX_STACK_SIZE) \ +- : (((unsigned long)current_thread_info()) + \ +- THREAD_SIZE - (unsigned long)(ADDR))) ++#define MAX_STACK_SIZE 64UL ++#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - = (unsigned long)(ADDR)) +=20 + #define flush_insn_slot(p) do { } while (0) +=20 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/kvm_host.h linux-2.6.32.= 39/arch/x86/include/asm/kvm_host.h +--- linux-2.6.32.39/arch/x86/include/asm/kvm_host.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/kvm_host.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -533,7 +533,7 @@ struct kvm_x86_ops { const struct trace_print_flags *exit_reasons_str; }; @@ -8015,9 +8027,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/kvm= _host.h linux-2.6.32.38/arch/ =20 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.32.38/arch/x86/include/asm/local.h linux-2.6.32.38/= arch/x86/include/asm/local.h ---- linux-2.6.32.38/arch/x86/include/asm/local.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/local.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/local.h linux-2.6.32.39/= arch/x86/include/asm/local.h +--- linux-2.6.32.39/arch/x86/include/asm/local.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/local.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -18,26 +18,58 @@ typedef struct { =20 static inline void local_inc(local_t *l) @@ -8170,23 +8182,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/lo= cal.h linux-2.6.32.38/arch/x86 : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.32.38/arch/x86/include/asm/mc146818rtc.h linux-2.6.= 32.38/arch/x86/include/asm/mc146818rtc.h ---- linux-2.6.32.38/arch/x86/include/asm/mc146818rtc.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/mc146818rtc.h 2011-04-17 15:56:= 46.000000000 -0400 -@@ -81,8 +81,8 @@ static inline unsigned char current_lock - #else - #define lock_cmos_prefix(reg) do {} while (0) - #define lock_cmos_suffix(reg) do {} while (0) --#define lock_cmos(reg) --#define unlock_cmos() -+#define lock_cmos(reg) do {} while (0) -+#define unlock_cmos() do {} while (0) - #define do_i_have_lock_cmos() 0 - #define current_lock_cmos_reg() 0 - #endif -diff -urNp linux-2.6.32.38/arch/x86/include/asm/microcode.h linux-2.6.32= .38/arch/x86/include/asm/microcode.h ---- linux-2.6.32.38/arch/x86/include/asm/microcode.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/microcode.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/microcode.h linux-2.6.32= .39/arch/x86/include/asm/microcode.h +--- linux-2.6.32.39/arch/x86/include/asm/microcode.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/microcode.h 2011-04-17 15:56:46= .000000000 -0400 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; =20 @@ -8227,9 +8225,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/mic= rocode.h linux-2.6.32.38/arch { return NULL; } -diff -urNp linux-2.6.32.38/arch/x86/include/asm/mman.h linux-2.6.32.38/a= rch/x86/include/asm/mman.h ---- linux-2.6.32.38/arch/x86/include/asm/mman.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/mman.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/mman.h linux-2.6.32.39/a= rch/x86/include/asm/mman.h +--- linux-2.6.32.39/arch/x86/include/asm/mman.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/mman.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -5,4 +5,14 @@ =20 #include @@ -8245,9 +8243,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/mma= n.h linux-2.6.32.38/arch/x86/ +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/mmu_context.h linux-2.6.= 32.38/arch/x86/include/asm/mmu_context.h ---- linux-2.6.32.38/arch/x86/include/asm/mmu_context.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/mmu_context.h 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/mmu_context.h linux-2.6.= 32.39/arch/x86/include/asm/mmu_context.h +--- linux-2.6.32.39/arch/x86/include/asm/mmu_context.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/mmu_context.h 2011-04-17 15:56:= 46.000000000 -0400 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m =20 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_str= uct *tsk) @@ -8371,9 +8369,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/mmu= _context.h linux-2.6.32.38/ar } =20 #define activate_mm(prev, next) \ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/mmu.h linux-2.6.32.38/ar= ch/x86/include/asm/mmu.h ---- linux-2.6.32.38/arch/x86/include/asm/mmu.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/mmu.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/mmu.h linux-2.6.32.39/ar= ch/x86/include/asm/mmu.h +--- linux-2.6.32.39/arch/x86/include/asm/mmu.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/mmu.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -8400,45 +8398,64 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/m= mu.h linux-2.6.32.38/arch/x86/i } mm_context_t; =20 #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.38/arch/x86/include/asm/module.h linux-2.6.32.38= /arch/x86/include/asm/module.h ---- linux-2.6.32.38/arch/x86/include/asm/module.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/module.h 2011-04-17 15:56:46.00= 0000000 -0400 -@@ -59,13 +59,31 @@ +diff -urNp linux-2.6.32.39/arch/x86/include/asm/module.h linux-2.6.32.39= /arch/x86/include/asm/module.h +--- linux-2.6.32.39/arch/x86/include/asm/module.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/module.h 2011-04-23 13:18:57.00= 0000000 -0400 +@@ -5,6 +5,7 @@ +=20 + #ifdef CONFIG_X86_64 + /* X86_64 does not define MODULE_PROC_FAMILY */ ++#define MODULE_PROC_FAMILY "" + #elif defined CONFIG_M386 + #define MODULE_PROC_FAMILY "386 " + #elif defined CONFIG_M486 +@@ -59,13 +60,36 @@ #error unknown processor family #endif =20 +-#ifdef CONFIG_X86_32 +-# ifdef CONFIG_4KSTACKS +-# define MODULE_STACKSIZE "4KSTACKS " +-# else +-# define MODULE_STACKSIZE "" +-# endif +-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE +#ifdef CONFIG_PAX_MEMORY_UDEREF +#define MODULE_PAX_UDEREF "UDEREF " +#else +#define MODULE_PAX_UDEREF "" +#endif + - #ifdef CONFIG_X86_32 - # ifdef CONFIG_4KSTACKS - # define MODULE_STACKSIZE "4KSTACKS " - # else - # define MODULE_STACKSIZE "" - # endif --# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE -+# ifdef CONFIG_PAX_KERNEXEC -+# define MODULE_PAX_KERNEXEC "KERNEXEC " -+# else -+# define MODULE_PAX_KERNEXEC "" -+# endif -+# ifdef CONFIG_GRKERNSEC -+# define MODULE_GRSEC "GRSECURITY " -+# else -+# define MODULE_GRSEC "" -+# endif -+# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODUL= E_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF ++#ifdef CONFIG_PAX_KERNEXEC ++#define MODULE_PAX_KERNEXEC "KERNEXEC " ++#else ++#define MODULE_PAX_KERNEXEC "" ++#endif ++ ++#ifdef CONFIG_PAX_REFCOUNT ++#define MODULE_PAX_REFCOUNT "REFCOUNT " +#else -+# define MODULE_ARCH_VERMAGIC MODULE_PAX_UDEREF ++#define MODULE_PAX_REFCOUNT "" #endif =20 ++#if defined(CONFIG_X86_32) && defined(CONFIG_4KSTACKS) ++#define MODULE_STACKSIZE "4KSTACKS " ++#else ++#define MODULE_STACKSIZE "" ++#endif ++ ++#ifdef CONFIG_GRKERNSEC ++#define MODULE_GRSEC "GRSECURITY " ++#else ++#define MODULE_GRSEC "" ++#endif ++ ++#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE= _GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT ++ #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/page_64_types.h linux-2.= 6.32.38/arch/x86/include/asm/page_64_types.h ---- linux-2.6.32.38/arch/x86/include/asm/page_64_types.h 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/page_64_types.h 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/page_64_types.h linux-2.= 6.32.39/arch/x86/include/asm/page_64_types.h +--- linux-2.6.32.39/arch/x86/include/asm/page_64_types.h 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/page_64_types.h 2011-04-17 15:5= 6:46.000000000 -0400 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from); =20 /* duplicated to the one in bootmem.h */ @@ -8448,9 +8465,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pag= e_64_types.h linux-2.6.32.38/ =20 extern unsigned long __phys_addr(unsigned long); #define __phys_reloc_hide(x) (x) -diff -urNp linux-2.6.32.38/arch/x86/include/asm/paravirt.h linux-2.6.32.= 38/arch/x86/include/asm/paravirt.h ---- linux-2.6.32.38/arch/x86/include/asm/paravirt.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/paravirt.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/paravirt.h linux-2.6.32.= 39/arch/x86/include/asm/paravirt.h +--- linux-2.6.32.39/arch/x86/include/asm/paravirt.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/paravirt.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -8504,9 +8521,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/par= avirt.h linux-2.6.32.38/arch/ #endif /* CONFIG_X86_32 */ =20 #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/paravirt_types.h linux-2= .6.32.38/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.32.38/arch/x86/include/asm/paravirt_types.h 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/paravirt_types.h 2011-04-17 15:= 56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h linux-2= .6.32.39/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h 2011-04-17 15:= 56:46.000000000 -0400 @@ -316,6 +316,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -8520,9 +8537,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/par= avirt_types.h linux-2.6.32.38 }; =20 struct raw_spinlock; -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pci_x86.h linux-2.6.32.3= 8/arch/x86/include/asm/pci_x86.h ---- linux-2.6.32.38/arch/x86/include/asm/pci_x86.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pci_x86.h 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pci_x86.h linux-2.6.32.3= 9/arch/x86/include/asm/pci_x86.h +--- linux-2.6.32.39/arch/x86/include/asm/pci_x86.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pci_x86.h 2011-04-17 15:56:46.0= 00000000 -0400 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct=20 extern void (*pcibios_disable_irq)(struct pci_dev *dev); =20 @@ -8545,9 +8562,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pci= _x86.h linux-2.6.32.38/arch/x extern bool port_cf9_safe; =20 /* arch_initcall level */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgalloc.h linux-2.6.32.3= 8/arch/x86/include/asm/pgalloc.h ---- linux-2.6.32.38/arch/x86/include/asm/pgalloc.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgalloc.h 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgalloc.h linux-2.6.32.3= 9/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32.39/arch/x86/include/asm/pgalloc.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgalloc.h 2011-04-17 15:56:46.0= 00000000 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -8562,9 +8579,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pga= lloc.h linux-2.6.32.38/arch/x set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } =20 -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable-2level.h linux-2= .6.32.38/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.32.38/arch/x86/include/asm/pgtable-2level.h 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:= 56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h linux-2= .6.32.39/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:= 56:46.000000000 -0400 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t=20 =20 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -8575,9 +8592,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgt= able-2level.h linux-2.6.32.38 } =20 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_32.h linux-2.6.3= 2.38/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.32.38/arch/x86/include/asm/pgtable_32.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h linux-2.6.3= 2.39/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -26,9 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -8621,9 +8638,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgt= able_32.h linux-2.6.32.38/arc /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_32_types.h linux= -2.6.32.38/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.32.38/arch/x86/include/asm/pgtable_32_types.h 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h linux= -2.6.32.39/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 1= 5:56:46.000000000 -0400 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -8653,9 +8670,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgt= able_32_types.h linux-2.6.32. #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable-3level.h linux-2= .6.32.38/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.32.38/arch/x86/include/asm/pgtable-3level.h 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:= 56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h linux-2= .6.32.39/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:= 56:46.000000000 -0400 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic =20 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -8673,9 +8690,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgt= able-3level.h linux-2.6.32.38 } =20 /* -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_64.h linux-2.6.3= 2.38/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.32.38/arch/x86/include/asm/pgtable_64.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_64.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h linux-2.6.3= 2.39/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -16,10 +16,13 @@ =20 extern pud_t level3_kernel_pgt[512]; @@ -8712,9 +8729,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgt= able_64.h linux-2.6.32.38/arc } =20 static inline void native_pgd_clear(pgd_t *pgd) -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_64_types.h linux= -2.6.32.38/arch/x86/include/asm/pgtable_64_types.h ---- linux-2.6.32.38/arch/x86/include/asm/pgtable_64_types.h 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h linux= -2.6.32.39/arch/x86/include/asm/pgtable_64_types.h +--- linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 1= 5:56:46.000000000 -0400 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) @@ -8726,9 +8743,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgt= able_64_types.h linux-2.6.32. +#define ktva_ktla(addr) (addr) =20 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable.h linux-2.6.32.3= 8/arch/x86/include/asm/pgtable.h ---- linux-2.6.32.38/arch/x86/include/asm/pgtable.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgtable.h 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable.h linux-2.6.32.3= 9/arch/x86/include/asm/pgtable.h +--- linux-2.6.32.39/arch/x86/include/asm/pgtable.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgtable.h 2011-04-17 15:56:46.0= 00000000 -0400 @@ -74,12 +74,51 @@ extern struct list_head pgd_list; =20 #define arch_end_context_switch(prev) do {} while(0) @@ -8898,9 +8915,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgt= able.h linux-2.6.32.38/arch/x =20 #include #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_types.h linux-2.= 6.32.38/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.32.38/arch/x86/include/asm/pgtable_types.h 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h linux-2.= 6.32.39/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:5= 6:46.000000000 -0400 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -9021,9 +9038,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgt= able_types.h linux-2.6.32.38/ =20 #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.32.38/arch/x86/include/asm/processor.h linux-2.6.32= .38/arch/x86/include/asm/processor.h ---- linux-2.6.32.38/arch/x86/include/asm/processor.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/processor.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/processor.h linux-2.6.32= .39/arch/x86/include/asm/processor.h +--- linux-2.6.32.39/arch/x86/include/asm/processor.h 2011-04-22 19:16:29= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/processor.h 2011-04-23 12:56:10= .000000000 -0400 @@ -272,7 +272,7 @@ struct tss_struct { =20 } ____cacheline_aligned; @@ -9068,7 +9085,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pro= cessor.h linux-2.6.32.38/arch - unsigned long *__ptr =3D (unsigned long *)(info); = \ - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); = \ -}) -+#define KSTK_TOP(info) ((info)->task.thread.sp0) ++#define KSTK_TOP(info) ((container_of(info, struct task_struct,= tinfo))->thread.sp0) =20 /* * The below -8 is to reserve 8 bytes on top of the ring0 stack. @@ -9108,9 +9125,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pro= cessor.h linux-2.6.32.38/arch #define KSTK_EIP(task) (task_pt_regs(task)->ip) =20 /* Get/set a process' ability to use the timestamp counter instruction = */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/ptrace.h linux-2.6.32.38= /arch/x86/include/asm/ptrace.h ---- linux-2.6.32.38/arch/x86/include/asm/ptrace.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/ptrace.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/ptrace.h linux-2.6.32.39= /arch/x86/include/asm/ptrace.h +--- linux-2.6.32.39/arch/x86/include/asm/ptrace.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/ptrace.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } =20 @@ -9147,9 +9164,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/ptr= ace.h linux-2.6.32.38/arch/x8 #endif } =20 -diff -urNp linux-2.6.32.38/arch/x86/include/asm/reboot.h linux-2.6.32.38= /arch/x86/include/asm/reboot.h ---- linux-2.6.32.38/arch/x86/include/asm/reboot.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/reboot.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/reboot.h linux-2.6.32.39= /arch/x86/include/asm/reboot.h +--- linux-2.6.32.39/arch/x86/include/asm/reboot.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/reboot.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; =20 void native_machine_crash_shutdown(struct pt_regs *regs); @@ -9159,9 +9176,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/reb= oot.h linux-2.6.32.38/arch/x8 =20 typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.32.38/arch/x86/include/asm/rwsem.h linux-2.6.32.38/= arch/x86/include/asm/rwsem.h ---- linux-2.6.32.38/arch/x86/include/asm/rwsem.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/rwsem.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/rwsem.h linux-2.6.32.39/= arch/x86/include/asm/rwsem.h +--- linux-2.6.32.39/arch/x86/include/asm/rwsem.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/rwsem.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -9286,9 +9303,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/rws= em.h linux-2.6.32.38/arch/x86 : "+r" (tmp), "+m" (sem->count) : : "memory"); =20 -diff -urNp linux-2.6.32.38/arch/x86/include/asm/segment.h linux-2.6.32.3= 8/arch/x86/include/asm/segment.h ---- linux-2.6.32.38/arch/x86/include/asm/segment.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/segment.h 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/segment.h linux-2.6.32.3= 9/arch/x86/include/asm/segment.h +--- linux-2.6.32.39/arch/x86/include/asm/segment.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/segment.h 2011-04-17 15:56:46.0= 00000000 -0400 @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -9357,9 +9374,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/seg= ment.h linux-2.6.32.38/arch/x #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) -diff -urNp linux-2.6.32.38/arch/x86/include/asm/smp.h linux-2.6.32.38/ar= ch/x86/include/asm/smp.h ---- linux-2.6.32.38/arch/x86/include/asm/smp.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/smp.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/smp.h linux-2.6.32.39/ar= ch/x86/include/asm/smp.h +--- linux-2.6.32.39/arch/x86/include/asm/smp.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/smp.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -24,7 +24,7 @@ extern unsigned int num_processors; DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map); DECLARE_PER_CPU(cpumask_var_t, cpu_core_map); @@ -9386,9 +9403,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/smp= .h linux-2.6.32.38/arch/x86/i #define safe_smp_processor_id() smp_processor_id() =20 #endif -diff -urNp linux-2.6.32.38/arch/x86/include/asm/spinlock.h linux-2.6.32.= 38/arch/x86/include/asm/spinlock.h ---- linux-2.6.32.38/arch/x86/include/asm/spinlock.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/spinlock.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/spinlock.h linux-2.6.32.= 39/arch/x86/include/asm/spinlock.h +--- linux-2.6.32.39/arch/x86/include/asm/spinlock.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/spinlock.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -9451,9 +9468,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/spi= nlock.h linux-2.6.32.38/arch/ : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } =20 -diff -urNp linux-2.6.32.38/arch/x86/include/asm/stackprotector.h linux-2= .6.32.38/arch/x86/include/asm/stackprotector.h ---- linux-2.6.32.38/arch/x86/include/asm/stackprotector.h 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/stackprotector.h 2011-04-17 15:= 56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/stackprotector.h linux-2= .6.32.39/arch/x86/include/asm/stackprotector.h +--- linux-2.6.32.39/arch/x86/include/asm/stackprotector.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/stackprotector.h 2011-04-17 15:= 56:46.000000000 -0400 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se =20 static inline void load_stack_canary_segment(void) @@ -9463,9 +9480,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/sta= ckprotector.h linux-2.6.32.38 asm volatile ("mov %0, %%gs" : : "r" (0)); #endif } -diff -urNp linux-2.6.32.38/arch/x86/include/asm/system.h linux-2.6.32.38= /arch/x86/include/asm/system.h ---- linux-2.6.32.38/arch/x86/include/asm/system.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/system.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/system.h linux-2.6.32.39= /arch/x86/include/asm/system.h +--- linux-2.6.32.39/arch/x86/include/asm/system.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/system.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -132,7 +132,7 @@ do { \ "thread_return:\n\t" \ "movq "__percpu_arg([current_task])",%%rsi\n\t" \ @@ -9502,9 +9519,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/sys= tem.h linux-2.6.32.38/arch/x8 extern void free_init_pages(char *what, unsigned long begin, unsigned l= ong end); =20 void default_idle(void); -diff -urNp linux-2.6.32.38/arch/x86/include/asm/thread_info.h linux-2.6.= 32.38/arch/x86/include/asm/thread_info.h ---- linux-2.6.32.38/arch/x86/include/asm/thread_info.h 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/thread_info.h 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/thread_info.h linux-2.6.= 32.39/arch/x86/include/asm/thread_info.h +--- linux-2.6.32.39/arch/x86/include/asm/thread_info.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/thread_info.h 2011-04-23 13:24:= 42.000000000 -0400 @@ -10,6 +10,7 @@ #include #include @@ -9556,7 +9573,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/thr= ead_info.h linux-2.6.32.38/ar =20 +#ifdef __ASSEMBLY__ +/* how to get the thread information struct from ASM */ -+#define GET_THREAD_INFO(reg) \ ++#define GET_THREAD_INFO(reg) \ + mov PER_CPU_VAR(current_tinfo), reg + +/* use this one if reg already contains %esp */ @@ -9638,8 +9655,8 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/thr= ead_info.h linux-2.6.32.38/ar #define arch_task_cache_init arch_task_cache_init + +#define __HAVE_THREAD_FUNCTIONS -+#define task_thread_info(task) (&(task)->tinfo) -+#define task_stack_page(task) ((task)->stack) ++#define task_thread_info(task) (&(task)->tinfo) ++#define task_stack_page(task) ((task)->stack) +#define setup_thread_stack(p, org) do {} while (0) +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1) + @@ -9649,9 +9666,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/thr= ead_info.h linux-2.6.32.38/ar + #endif #endif /* _ASM_X86_THREAD_INFO_H */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess_32.h linux-2.6.3= 2.38/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.32.38/arch/x86/include/asm/uaccess_32.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/uaccess_32.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h linux-2.6.3= 2.39/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned lon= g n) @@ -9781,9 +9798,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/uac= cess_32.h linux-2.6.32.38/arc long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess_64.h linux-2.6.3= 2.38/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.32.38/arch/x86/include/asm/uaccess_64.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/uaccess_64.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.3= 2.39/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -9,6 +9,9 @@ #include #include @@ -10129,9 +10146,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/u= access_64.h linux-2.6.32.38/arc copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zero= rest); =20 #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess.h linux-2.6.32.3= 8/arch/x86/include/asm/uaccess.h ---- linux-2.6.32.38/arch/x86/include/asm/uaccess.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/uaccess.h 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess.h linux-2.6.32.3= 9/arch/x86/include/asm/uaccess.h +--- linux-2.6.32.39/arch/x86/include/asm/uaccess.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/uaccess.h 2011-04-17 15:56:46.0= 00000000 -0400 @@ -8,12 +8,15 @@ #include #include @@ -10350,9 +10367,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/u= access.h linux-2.6.32.38/arch/x #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.32.38/arch/x86/include/asm/vgtod.h linux-2.6.32.38/= arch/x86/include/asm/vgtod.h ---- linux-2.6.32.38/arch/x86/include/asm/vgtod.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/vgtod.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/vgtod.h linux-2.6.32.39/= arch/x86/include/asm/vgtod.h +--- linux-2.6.32.39/arch/x86/include/asm/vgtod.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/vgtod.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -10361,9 +10378,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/v= gtod.h linux-2.6.32.38/arch/x86 cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.32.38/arch/x86/include/asm/vmi.h linux-2.6.32.38/ar= ch/x86/include/asm/vmi.h ---- linux-2.6.32.38/arch/x86/include/asm/vmi.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/vmi.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/vmi.h linux-2.6.32.39/ar= ch/x86/include/asm/vmi.h +--- linux-2.6.32.39/arch/x86/include/asm/vmi.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/vmi.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -10372,9 +10389,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/v= mi.h linux-2.6.32.38/arch/x86/i } __attribute__((packed)); =20 struct pnp_header { -diff -urNp linux-2.6.32.38/arch/x86/include/asm/vsyscall.h linux-2.6.32.= 38/arch/x86/include/asm/vsyscall.h ---- linux-2.6.32.38/arch/x86/include/asm/vsyscall.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/vsyscall.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/vsyscall.h linux-2.6.32.= 39/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32.39/arch/x86/include/asm/vsyscall.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/vsyscall.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { =20 #ifdef __KERNEL__ @@ -10405,9 +10422,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/v= syscall.h linux-2.6.32.38/arch/ #endif /* __KERNEL__ */ =20 #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.32.38/arch/x86/include/asm/xsave.h linux-2.6.32.38/= arch/x86/include/asm/xsave.h ---- linux-2.6.32.38/arch/x86/include/asm/xsave.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/include/asm/xsave.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/include/asm/xsave.h linux-2.6.32.39/= arch/x86/include/asm/xsave.h +--- linux-2.6.32.39/arch/x86/include/asm/xsave.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/include/asm/xsave.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct static inline int xsave_user(struct xsave_struct __user *buf) { @@ -10433,9 +10450,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/x= save.h linux-2.6.32.38/arch/x86 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.32.38/arch/x86/Kconfig linux-2.6.32.38/arch/x86/Kco= nfig ---- linux-2.6.32.38/arch/x86/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/Kconfig linux-2.6.32.39/arch/x86/Kco= nfig +--- linux-2.6.32.39/arch/x86/Kconfig 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/Kconfig 2011-04-17 15:56:46.000000000 -0400 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE =20 config X86_32_LAZY_GS @@ -10517,9 +10534,9 @@ diff -urNp linux-2.6.32.38/arch/x86/Kconfig linux= -2.6.32.38/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.32.38/arch/x86/Kconfig.cpu linux-2.6.32.38/arch/x86= /Kconfig.cpu ---- linux-2.6.32.38/arch/x86/Kconfig.cpu 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/arch/x86/Kconfig.cpu 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/arch/x86/Kconfig.cpu linux-2.6.32.39/arch/x86= /Kconfig.cpu +--- linux-2.6.32.39/arch/x86/Kconfig.cpu 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/arch/x86/Kconfig.cpu 2011-04-17 15:56:46.000000000 -= 0400 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE =20 config X86_F00F_BUG @@ -10547,9 +10564,9 @@ diff -urNp linux-2.6.32.38/arch/x86/Kconfig.cpu l= inux-2.6.32.38/arch/x86/Kconfig =20 config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.32.38/arch/x86/Kconfig.debug linux-2.6.32.38/arch/x= 86/Kconfig.debug ---- linux-2.6.32.38/arch/x86/Kconfig.debug 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/Kconfig.debug 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/Kconfig.debug linux-2.6.32.39/arch/x= 86/Kconfig.debug +--- linux-2.6.32.39/arch/x86/Kconfig.debug 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/Kconfig.debug 2011-04-17 15:56:46.000000000= -0400 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -10559,21 +10576,9 @@ diff -urNp linux-2.6.32.38/arch/x86/Kconfig.debu= g linux-2.6.32.38/arch/x86/Kconf ---help--- Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const -diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/boot.c linux-2.6.32.38/a= rch/x86/kernel/acpi/boot.c ---- linux-2.6.32.38/arch/x86/kernel/acpi/boot.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/acpi/boot.c 2011-04-17 15:56:46.0000= 00000 -0400 -@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a - DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), - }, - }, -- {} -+ { NULL, NULL, {{0, {0}}}, NULL} - }; -=20 - /* -diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S linux-= 2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S 2011-04-17 15= :56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S linux-= 2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S 2011-04-17 15= :56:46.000000000 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -10583,9 +10588,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/r= ealmode/wakeup.S linux-2.6.32.3 wrmsr 1: =20 -diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/sleep.c linux-2.6.32.38/= arch/x86/kernel/acpi/sleep.c ---- linux-2.6.32.38/arch/x86/kernel/acpi/sleep.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/acpi/sleep.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c linux-2.6.32.39/= arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -11,11 +11,12 @@ #include #include @@ -10630,9 +10635,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/s= leep.c linux-2.6.32.38/arch/x86 } =20 =20 -diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32= .38/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.32.38/arch/x86/kernel/acpi/wakeup_32.S 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32= .39/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:56:46= .000000000 -0400 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -10649,9 +10654,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/w= akeup_32.S linux-2.6.32.38/arch =20 bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.32.38/arch/x86/kernel/alternative.c linux-2.6.32.38= /arch/x86/kernel/alternative.c ---- linux-2.6.32.38/arch/x86/kernel/alternative.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/alternative.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/alternative.c linux-2.6.32.39= /arch/x86/kernel/alternative.c +--- linux-2.6.32.39/arch/x86/kernel/alternative.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/alternative.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str =20 BUG_ON(p->len > MAX_PATCH_LEN); @@ -10734,9 +10739,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/altern= ative.c linux-2.6.32.38/arch/x8 + BUG_ON((vaddr)[i] !=3D ((const unsigned char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.32.38/arch/x86/kernel/amd_iommu.c linux-2.6.32.38/a= rch/x86/kernel/amd_iommu.c ---- linux-2.6.32.38/arch/x86/kernel/amd_iommu.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/amd_iommu.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/amd_iommu.c linux-2.6.32.39/a= rch/x86/kernel/amd_iommu.c +--- linux-2.6.32.39/arch/x86/kernel/amd_iommu.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/amd_iommu.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -2076,7 +2076,7 @@ static void prealloc_protection_domains( } } @@ -10746,9 +10751,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/amd_io= mmu.c linux-2.6.32.38/arch/x86/ .alloc_coherent =3D alloc_coherent, .free_coherent =3D free_coherent, .map_page =3D map_page, -diff -urNp linux-2.6.32.38/arch/x86/kernel/apic/io_apic.c linux-2.6.32.3= 8/arch/x86/kernel/apic/io_apic.c ---- linux-2.6.32.38/arch/x86/kernel/apic/io_apic.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/apic/io_apic.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c linux-2.6.32.3= 9/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries =3D kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_ATOMIC); @@ -10785,9 +10790,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/apic/i= o_apic.c linux-2.6.32.38/arch/x { spin_unlock(&vector_lock); } -diff -urNp linux-2.6.32.38/arch/x86/kernel/apm_32.c linux-2.6.32.38/arch= /x86/kernel/apm_32.c ---- linux-2.6.32.38/arch/x86/kernel/apm_32.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/apm_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/apm_32.c linux-2.6.32.39/arch= /x86/kernel/apm_32.c +--- linux-2.6.32.39/arch/x86/kernel/apm_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/apm_32.c 2011-04-23 12:56:10.0000000= 00 -0400 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. @@ -10852,28 +10857,7 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/apm_3= 2.c linux-2.6.32.38/arch/x86/ker 0xb8, 0x00, 0x10, /* movw $0x1000,ax */ 0x8e, 0xd0, /* movw ax,ss */ 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */ -@@ -1933,7 +1947,10 @@ static const struct file_operations apm_ - static struct miscdevice apm_device =3D { - APM_MINOR_DEV, - "apm_bios", -- &apm_bios_fops -+ &apm_bios_fops, -+ {NULL, NULL}, -+ NULL, -+ NULL - }; -=20 -=20 -@@ -2254,7 +2271,7 @@ static struct dmi_system_id __initdata a - { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, - }, -=20 -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} - }; -=20 - /* -@@ -2357,12 +2374,15 @@ static int __init apm_init(void) +@@ -2357,12 +2371,15 @@ static int __init apm_init(void) * code to that CPU. */ gdt =3D get_cpu_gdt_table(0); @@ -10889,9 +10873,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/apm_32= .c linux-2.6.32.38/arch/x86/ker =20 proc_create("apm", 0, NULL, &apm_file_ops); =20 -diff -urNp linux-2.6.32.38/arch/x86/kernel/asm-offsets_32.c linux-2.6.32= .38/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.32.38/arch/x86/kernel/asm-offsets_32.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/asm-offsets_32.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c linux-2.6.32= .39/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c 2011-04-17 15:56:46= .000000000 -0400 @@ -51,7 +51,6 @@ void foo(void) OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id); BLANK(); @@ -10912,9 +10896,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/asm-of= fsets_32.c linux-2.6.32.38/arch #endif =20 #ifdef CONFIG_XEN -diff -urNp linux-2.6.32.38/arch/x86/kernel/asm-offsets_64.c linux-2.6.32= .38/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.32.38/arch/x86/kernel/asm-offsets_64.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/asm-offsets_64.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c linux-2.6.32= .39/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c 2011-04-17 15:56:46= .000000000 -0400 @@ -63,6 +63,18 @@ int main(void) OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); @@ -10942,10 +10926,10 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/asm-= offsets_64.c linux-2.6.32.38/arch DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/amd.c linux-2.6.32.38/arc= h/x86/kernel/cpu/amd.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/amd.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/amd.c 2011-04-17 15:56:46.000000= 000 -0400 -@@ -573,7 +573,7 @@ static unsigned int __cpuinit amd_size_c +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/amd.c linux-2.6.32.39/arc= h/x86/kernel/cpu/amd.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/amd.c 2011-04-22 19:16:29.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/amd.c 2011-04-22 19:16:41.000000= 000 -0400 +@@ -596,7 +596,7 @@ static unsigned int __cpuinit amd_size_c unsigned int size) { /* AMD errata T13 (order #21922) */ @@ -10954,9 +10938,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/am= d.c linux-2.6.32.38/arch/x86/ke /* Duron Rev A0 */ if (c->x86_model =3D=3D 3 && c->x86_mask =3D=3D 0) size =3D 64; -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/common.c linux-2.6.32.38/= arch/x86/kernel/cpu/common.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/common.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/common.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/common.c linux-2.6.32.39/= arch/x86/kernel/cpu/common.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/common.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/common.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon =20 static const struct cpu_dev *this_cpu __cpuinitdata =3D &default_cpu; @@ -11101,33 +11085,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/c= ommon.c linux-2.6.32.38/arch/x86 struct thread_struct *thread =3D &curr->thread; =20 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c li= nux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-03-2= 7 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-04-1= 7 15:56:46.000000000 -0400 -@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any - DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrin= o.c linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 201= 1-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 201= 1-04-17 15:56:46.000000000 -0400 -@@ -225,7 +225,7 @@ static struct cpu_model models[] =3D - { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, - { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, -=20 -- { NULL, } -+ { NULL, NULL, 0, NULL} - }; - #undef _BANIAS - #undef BANIAS -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/intel.c linux-2.6.32.38/a= rch/x86/kernel/cpu/intel.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/intel.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/intel.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/intel.c linux-2.6.32.39/a= rch/x86/kernel/cpu/intel.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/intel.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/intel.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. @@ -11137,9 +11097,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/in= tel.c linux-2.6.32.38/arch/x86/ load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2= .6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-04-17 15:= 56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2= .6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-04-17 15:= 56:46.000000000 -0400 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -11149,9 +11109,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/in= tel_cacheinfo.c linux-2.6.32.38 .show =3D show, .store =3D store, }; -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/Makefile linux-2.6.32.38/= arch/x86/kernel/cpu/Makefile ---- linux-2.6.32.38/arch/x86/kernel/cpu/Makefile 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/Makefile 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/Makefile linux-2.6.32.39/= arch/x86/kernel/cpu/Makefile +--- linux-2.6.32.39/arch/x86/kernel/cpu/Makefile 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/Makefile 2011-04-17 15:56:46.000= 000000 -0400 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o =3D -pg endif @@ -11163,9 +11123,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/Ma= kefile linux-2.6.32.38/arch/x86 obj-y :=3D intel_cacheinfo.o addon_cpuid_features.o obj-y +=3D proc.o capflags.o powerflags.o common.o obj-y +=3D vmware.o hypervisor.o sched.o -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.= 6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.= 6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -11175,9 +11135,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mc= heck/mce_amd.c linux-2.6.32.38/ .show =3D show, .store =3D store, }; -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32= .38/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32= .39/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-23 12:56:10= .000000000 -0400 @@ -43,6 +43,7 @@ #include #include @@ -11230,17 +11190,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/m= check/mce.c linux-2.6.32.38/arch open_exclu =3D 0; =20 spin_unlock(&mce_state_lock); -@@ -1595,6 +1596,7 @@ static struct miscdevice mce_log_device=20 - MISC_MCELOG_MINOR, - "mcelog", - &mce_chrdev_ops, -+ {NULL, NULL}, NULL, NULL - }; -=20 - /* -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.3= 8/arch/x86/kernel/cpu/mtrr/amd.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/amd.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/amd.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.3= 9/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -11250,9 +11202,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mt= rr/amd.c linux-2.6.32.38/arch/x .vendor =3D X86_VENDOR_AMD, .set =3D amd_set_mtrr, .get =3D amd_get_mtrr, -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.= 32.38/arch/x86/kernel/cpu/mtrr/centaur.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/centaur.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/centaur.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.= 32.39/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long=20 return 0; } @@ -11262,9 +11214,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mt= rr/centaur.c linux-2.6.32.38/ar .vendor =3D X86_VENDOR_CENTAUR, .set =3D centaur_set_mcr, .get =3D centaur_get_mcr, -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32= .38/arch/x86/kernel/cpu/mtrr/cyrix.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32= .39/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-04-17 15:56:46= .000000000 -0400 @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } @@ -11274,18 +11226,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/m= trr/cyrix.c linux-2.6.32.38/arch .vendor =3D X86_VENDOR_CYRIX, .set_all =3D cyrix_set_all, .set =3D cyrix_set_arr, -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.= 32.38/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-17 15:56:= 46.000000000 -0400 -@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra - { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ - { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ - { MSR_MTRRfix4K_C0000, 8 }, /* eight 4k MTRRs */ -- {} -+ { 0, 0 } - }; -=20 - static unsigned long smp_changes_mask; +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.= 32.39/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-23 12:56:= 10.000000000 -0400 @@ -752,7 +752,7 @@ int positive_have_wrcomb(void) /* * Generic structure... @@ -11295,9 +11238,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mt= rr/generic.c linux-2.6.32.38/ar .use_intel_if =3D 1, .set_all =3D generic_set_all, .get =3D generic_get_mtrr, -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.= 38/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:00:52.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:03:05.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.= 39/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:00:52.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:03:05.= 000000000 -0400 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -11316,9 +11259,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mt= rr/main.c linux-2.6.32.38/arch/ { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] =3D ops; -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.= 38/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.= 39/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; =20 @@ -11369,9 +11312,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mt= rr/mtrr.h linux-2.6.32.38/arch/ =20 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor =3D=3D X86_VENDOR_##vnd= ) #define use_intel() (mtrr_if && mtrr_if->use_intel_if =3D=3D 1) -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c linux-= 2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-04-17 15= :56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c linux-= 2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-04-17 15= :56:46.000000000 -0400 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { =20 /* Interface defining a CPU specific perfctr watchdog */ @@ -11405,9 +11348,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/pe= rfctr-watchdog.c linux-2.6.32.3 static struct wd_ops intel_arch_wd_ops __read_mostly =3D { .reserve =3D single_msr_reserve, .unreserve =3D single_msr_unreserve, -diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/perf_event.c linux-2.6.32= .38/arch/x86/kernel/cpu/perf_event.c ---- linux-2.6.32.38/arch/x86/kernel/cpu/perf_event.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/cpu/perf_event.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c linux-2.6.32= .39/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c 2011-04-17 15:56:46= .000000000 -0400 @@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs break; =20 @@ -11417,9 +11360,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/pe= rf_event.c linux-2.6.32.38/arch } } =20 -diff -urNp linux-2.6.32.38/arch/x86/kernel/crash.c linux-2.6.32.38/arch/= x86/kernel/crash.c ---- linux-2.6.32.38/arch/x86/kernel/crash.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/crash.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/crash.c linux-2.6.32.39/arch/= x86/kernel/crash.c +--- linux-2.6.32.39/arch/x86/kernel/crash.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/crash.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,=20 regs =3D args->regs; =20 @@ -11429,9 +11372,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/crash.= c linux-2.6.32.38/arch/x86/kern crash_fixup_ss_esp(&fixed_regs, regs); regs =3D &fixed_regs; } -diff -urNp linux-2.6.32.38/arch/x86/kernel/doublefault_32.c linux-2.6.32= .38/arch/x86/kernel/doublefault_32.c ---- linux-2.6.32.38/arch/x86/kernel/doublefault_32.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/doublefault_32.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/doublefault_32.c linux-2.6.32= .39/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32.39/arch/x86/kernel/doublefault_32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/doublefault_32.c 2011-04-17 15:56:46= .000000000 -0400 @@ -11,7 +11,7 @@ =20 #define DOUBLEFAULT_STACKSIZE (1024) @@ -11463,9 +11406,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/double= fault_32.c linux-2.6.32.38/arch .fs =3D __KERNEL_PERCPU, =20 .__cr3 =3D __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack_32.c linux-2.6.32.3= 8/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.32.38/arch/x86/kernel/dumpstack_32.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c linux-2.6.32.3= 9/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task #endif =20 @@ -11531,9 +11474,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpst= ack_32.c linux-2.6.32.38/arch/x if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack_64.c linux-2.6.32.3= 8/arch/x86/kernel/dumpstack_64.c ---- linux-2.6.32.38/arch/x86/kernel/dumpstack_64.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c linux-2.6.32.3= 9/arch/x86/kernel/dumpstack_64.c +--- linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task unsigned long *irq_stack_end =3D (unsigned long *)per_cpu(irq_stack_ptr, cpu); @@ -11584,9 +11527,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpst= ack_64.c linux-2.6.32.38/arch/x put_cpu(); } EXPORT_SYMBOL(dump_trace); -diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack.c linux-2.6.32.38/a= rch/x86/kernel/dumpstack.c ---- linux-2.6.32.38/arch/x86/kernel/dumpstack.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/dumpstack.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack.c linux-2.6.32.39/a= rch/x86/kernel/dumpstack.c +--- linux-2.6.32.39/arch/x86/kernel/dumpstack.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/dumpstack.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -2,6 +2,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs @@ -11703,34 +11646,21 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/dump= stack.c linux-2.6.32.38/arch/x86/ report_bug(regs->ip, regs); =20 if (__die(str, regs, err)) -diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack.h linux-2.6.32.38/a= rch/x86/kernel/dumpstack.h ---- linux-2.6.32.38/arch/x86/kernel/dumpstack.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/dumpstack.h 2011-04-17 15:56:46.0000= 00000 -0400 -@@ -14,11 +14,16 @@ - #define get_bp(bp) asm("movq %%rbp, %0" : "=3Dr" (bp) :) +diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack.h linux-2.6.32.39/a= rch/x86/kernel/dumpstack.h +--- linux-2.6.32.39/arch/x86/kernel/dumpstack.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/dumpstack.h 2011-04-23 13:25:26.0000= 00000 -0400 +@@ -15,7 +15,7 @@ #endif =20 --extern unsigned long + extern unsigned long -print_context_stack(struct thread_info *tinfo, -- unsigned long *stack, unsigned long bp, -- const struct stacktrace_ops *ops, void *data, -- unsigned long *end, int *graph); -+typedef unsigned long walk_stack_t(struct task_struct *task, -+ void *stack_start, -+ unsigned long *stack, -+ unsigned long bp, -+ const struct stacktrace_ops *ops, -+ void *data, -+ unsigned long *end, -+ int *graph); -+ -+extern walk_stack_t print_context_stack; -=20 - extern void - show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, -diff -urNp linux-2.6.32.38/arch/x86/kernel/e820.c linux-2.6.32.38/arch/x= 86/kernel/e820.c ---- linux-2.6.32.38/arch/x86/kernel/e820.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/kernel/e820.c 2011-04-17 15:56:46.000000000= -0400 ++print_context_stack(struct task_struct *task, void *stack_start, + unsigned long *stack, unsigned long bp, + const struct stacktrace_ops *ops, void *data, + unsigned long *end, int *graph); +diff -urNp linux-2.6.32.39/arch/x86/kernel/e820.c linux-2.6.32.39/arch/x= 86/kernel/e820.c +--- linux-2.6.32.39/arch/x86/kernel/e820.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/kernel/e820.c 2011-04-17 15:56:46.000000000= -0400 @@ -733,7 +733,7 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata =3D { @@ -11740,9 +11670,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/e820.c= linux-2.6.32.38/arch/x86/kerne }; =20 static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.32.38/arch/x86/kernel/efi_32.c linux-2.6.32.38/arch= /x86/kernel/efi_32.c ---- linux-2.6.32.38/arch/x86/kernel/efi_32.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/efi_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/efi_32.c linux-2.6.32.39/arch= /x86/kernel/efi_32.c +--- linux-2.6.32.39/arch/x86/kernel/efi_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/efi_32.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -38,70 +38,38 @@ */ =20 @@ -11823,9 +11753,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/efi_32= .c linux-2.6.32.38/arch/x86/ker =20 /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.32.38/arch/x86/kernel/efi_stub_32.S linux-2.6.32.38= /arch/x86/kernel/efi_stub_32.S ---- linux-2.6.32.38/arch/x86/kernel/efi_stub_32.S 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/efi_stub_32.S 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S linux-2.6.32.39= /arch/x86/kernel/efi_stub_32.S +--- linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S 2011-04-17 15:56:46.00= 0000000 -0400 @@ -6,6 +6,7 @@ */ =20 @@ -11924,9 +11854,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/efi_st= ub_32.S linux-2.6.32.38/arch/x8 saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.32.38/arch/x86/kernel/entry_32.S linux-2.6.32.38/ar= ch/x86/kernel/entry_32.S ---- linux-2.6.32.38/arch/x86/kernel/entry_32.S 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/entry_32.S 2011-04-19 17:24:49.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/ar= ch/x86/kernel/entry_32.S +--- linux-2.6.32.39/arch/x86/kernel/entry_32.S 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/entry_32.S 2011-04-19 17:24:49.00000= 0000 -0400 @@ -185,13 +185,81 @@ /*CFI_REL_OFFSET gs, PT_GS*/ .endm @@ -12292,9 +12222,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/entry_= 32.S linux-2.6.32.38/arch/x86/k RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.32.38/arch/x86/kernel/entry_64.S linux-2.6.32.38/ar= ch/x86/kernel/entry_64.S ---- linux-2.6.32.38/arch/x86/kernel/entry_64.S 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/entry_64.S 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/ar= ch/x86/kernel/entry_64.S +--- linux-2.6.32.39/arch/x86/kernel/entry_64.S 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/entry_64.S 2011-04-17 15:56:46.00000= 0000 -0400 @@ -53,6 +53,7 @@ #include #include @@ -12786,9 +12716,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/entry_= 64.S linux-2.6.32.38/arch/x86/k RESTORE_ALL 8 jmp irq_return nmi_userspace: -diff -urNp linux-2.6.32.38/arch/x86/kernel/ftrace.c linux-2.6.32.38/arch= /x86/kernel/ftrace.c ---- linux-2.6.32.38/arch/x86/kernel/ftrace.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/ftrace.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/ftrace.c linux-2.6.32.39/arch= /x86/kernel/ftrace.c +--- linux-2.6.32.39/arch/x86/kernel/ftrace.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/ftrace.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) { if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { @@ -12854,9 +12784,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/ftrace= .c linux-2.6.32.38/arch/x86/ker if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; =20 -diff -urNp linux-2.6.32.38/arch/x86/kernel/head32.c linux-2.6.32.38/arch= /x86/kernel/head32.c ---- linux-2.6.32.38/arch/x86/kernel/head32.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/head32.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/head32.c linux-2.6.32.39/arch= /x86/kernel/head32.c +--- linux-2.6.32.39/arch/x86/kernel/head32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/head32.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -16,6 +16,7 @@ #include #include @@ -12874,9 +12804,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/head32= .c linux-2.6.32.38/arch/x86/ker =20 #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.32.38/arch/x86/kernel/head_32.S linux-2.6.32.38/arc= h/x86/kernel/head_32.S ---- linux-2.6.32.38/arch/x86/kernel/head_32.S 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/head_32.S 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/head_32.S linux-2.6.32.39/arc= h/x86/kernel/head_32.S +--- linux-2.6.32.39/arch/x86/kernel/head_32.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/head_32.S 2011-04-17 15:56:46.000000= 000 -0400 @@ -19,10 +19,17 @@ #include #include @@ -13346,9 +13276,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/head_3= 2.S linux-2.6.32.38/arch/x86/ke + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.32.38/arch/x86/kernel/head_64.S linux-2.6.32.38/arc= h/x86/kernel/head_64.S ---- linux-2.6.32.38/arch/x86/kernel/head_64.S 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/head_64.S 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/head_64.S linux-2.6.32.39/arc= h/x86/kernel/head_64.S +--- linux-2.6.32.39/arch/x86/kernel/head_64.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/head_64.S 2011-04-17 15:56:46.000000= 000 -0400 @@ -19,6 +19,7 @@ #include #include @@ -13619,9 +13549,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/head_6= 4.S linux-2.6.32.38/arch/x86/ke =20 __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.32.38/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.= 38/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.32.38/arch/x86/kernel/i386_ksyms_32.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.= 39/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -13643,9 +13573,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/i386_k= syms_32.c linux-2.6.32.38/arch/ +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.32.38/arch/x86/kernel/init_task.c linux-2.6.32.38/a= rch/x86/kernel/init_task.c ---- linux-2.6.32.38/arch/x86/kernel/init_task.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/init_task.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/init_task.c linux-2.6.32.39/a= rch/x86/kernel/init_task.c +--- linux-2.6.32.39/arch/x86/kernel/init_task.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/init_task.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan * way process stacks are handled. This is done by having a special * "init_task" linker map entry.. @@ -13664,9 +13594,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/init_t= ask.c linux-2.6.32.38/arch/x86/ - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_s= mp =3D { [0 ... NR_CPUS-1] =3D INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.32.38/arch/x86/kernel/ioport.c linux-2.6.32.38/arch= /x86/kernel/ioport.c ---- linux-2.6.32.38/arch/x86/kernel/ioport.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/ioport.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/ioport.c linux-2.6.32.39/arch= /x86/kernel/ioport.c +--- linux-2.6.32.39/arch/x86/kernel/ioport.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/ioport.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -6,6 +6,7 @@ #include #include @@ -13710,9 +13640,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/ioport= .c linux-2.6.32.38/arch/x86/ker if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-2.6.32.38/arch/x86/kernel/irq_32.c linux-2.6.32.38/arch= /x86/kernel/irq_32.c ---- linux-2.6.32.38/arch/x86/kernel/irq_32.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/irq_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/irq_32.c linux-2.6.32.39/arch= /x86/kernel/irq_32.c +--- linux-2.6.32.39/arch/x86/kernel/irq_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/irq_32.c 2011-04-23 13:26:46.0000000= 00 -0400 @@ -35,7 +35,7 @@ static int check_stack_overflow(void) __asm__ __volatile__("andl %%esp,%0" : "=3Dr" (sp) : "0" (THREAD_SIZE - 1)); @@ -13722,17 +13652,19 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/irq_= 32.c linux-2.6.32.38/arch/x86/ker } =20 static void print_stack_overflow(void) -@@ -54,8 +54,8 @@ static inline void print_stack_overflow( +@@ -54,9 +54,9 @@ static inline void print_stack_overflow( * per-CPU IRQ handling contexts (thread information and stack) */ union irq_ctx { - struct thread_info tinfo; - u32 stack[THREAD_SIZE/sizeof(u32)]; +-} __attribute__((aligned(PAGE_SIZE))); + unsigned long previous_esp; + u32 stack[THREAD_SIZE/sizeof(u32)]; - } __attribute__((aligned(PAGE_SIZE))); ++} __attribute__((aligned(THREAD_SIZE))); =20 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx); + static DEFINE_PER_CPU(union irq_ctx *, softirq_ctx); @@ -78,10 +78,9 @@ static void call_on_stack(void *func, vo static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) @@ -13813,8 +13745,8 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/irq_32= .c linux-2.6.32.38/arch/x86/ker - irqctx->tinfo.addr_limit =3D MAKE_MM_SEG(0); - - per_cpu(softirq_ctx, cpu) =3D irqctx; -+ per_cpu(hardirq_ctx, cpu) =3D page_address(alloc_pages_node(cpu_to_nod= e(cpu), THREAD_FLAGS, THREAD_ORDER)); -+ per_cpu(softirq_ctx, cpu) =3D page_address(alloc_pages_node(cpu_to_nod= e(cpu), THREAD_FLAGS, THREAD_ORDER)); ++ per_cpu(hardirq_ctx, cpu) =3D &per_cpu(hardirq_stack, cpu); ++ per_cpu(softirq_ctx, cpu) =3D &per_cpu(softirq_stack, cpu); =20 printk(KERN_DEBUG "CPU %u irqstacks, hard=3D%p soft=3D%p\n", cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu)); @@ -13853,9 +13785,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/irq_32= .c linux-2.6.32.38/arch/x86/ker /* * Shouldnt happen, we returned above if in_interrupt(): */ -diff -urNp linux-2.6.32.38/arch/x86/kernel/kgdb.c linux-2.6.32.38/arch/x= 86/kernel/kgdb.c ---- linux-2.6.32.38/arch/x86/kernel/kgdb.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/kernel/kgdb.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/kgdb.c linux-2.6.32.39/arch/x= 86/kernel/kgdb.c +--- linux-2.6.32.39/arch/x86/kernel/kgdb.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/kernel/kgdb.c 2011-04-17 15:56:46.000000000= -0400 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -13865,9 +13797,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/kgdb.c= linux-2.6.32.38/arch/x86/kerne /* Breakpoint instruction: */ .gdb_bpt_instr =3D { 0xcc }, .flags =3D KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.32.38/arch/x86/kernel/kprobes.c linux-2.6.32.38/arc= h/x86/kernel/kprobes.c ---- linux-2.6.32.38/arch/x86/kernel/kprobes.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/kprobes.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/kprobes.c linux-2.6.32.39/arc= h/x86/kernel/kprobes.c +--- linux-2.6.32.39/arch/x86/kernel/kprobes.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/kprobes.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -13969,9 +13901,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/kprobe= s.c linux-2.6.32.38/arch/x86/ke return ret; =20 switch (val) { -diff -urNp linux-2.6.32.38/arch/x86/kernel/ldt.c linux-2.6.32.38/arch/x8= 6/kernel/ldt.c ---- linux-2.6.32.38/arch/x86/kernel/ldt.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/kernel/ldt.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/ldt.c linux-2.6.32.39/arch/x8= 6/kernel/ldt.c +--- linux-2.6.32.39/arch/x86/kernel/ldt.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/kernel/ldt.c 2011-04-17 15:56:46.000000000 = -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -14036,9 +13968,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/ldt.c = linux-2.6.32.38/arch/x86/kernel fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl =3D 0; -diff -urNp linux-2.6.32.38/arch/x86/kernel/machine_kexec_32.c linux-2.6.= 32.38/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.32.38/arch/x86/kernel/machine_kexec_32.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c linux-2.6.= 32.39/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -14066,9 +13998,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/machin= e_kexec_32.c linux-2.6.32.38/ar =20 relocate_kernel_ptr =3D control_page; page_list[PA_CONTROL_PAGE] =3D __pa(control_page); -diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_amd.c linux-2.6.32.= 38/arch/x86/kernel/microcode_amd.c ---- linux-2.6.32.38/arch/x86/kernel/microcode_amd.c 2011-04-17 17:00:52.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/microcode_amd.c 2011-04-17 17:03:05.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_amd.c linux-2.6.32.= 39/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32.39/arch/x86/kernel/microcode_amd.c 2011-04-17 17:00:52.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/microcode_amd.c 2011-04-17 17:03:05.= 000000000 -0400 @@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int c uci->mc =3D NULL; } @@ -14087,9 +14019,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/microc= ode_amd.c linux-2.6.32.38/arch/ { return µcode_amd_ops; } -diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_core.c linux-2.6.32= .38/arch/x86/kernel/microcode_core.c ---- linux-2.6.32.38/arch/x86/kernel/microcode_core.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/microcode_core.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_core.c linux-2.6.32= .39/arch/x86/kernel/microcode_core.c +--- linux-2.6.32.39/arch/x86/kernel/microcode_core.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/microcode_core.c 2011-04-17 15:56:46= .000000000 -0400 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); =20 #define MICROCODE_VERSION "2.00" @@ -14099,9 +14031,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/microc= ode_core.c linux-2.6.32.38/arch =20 /* * Synchronization. -diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_intel.c linux-2.6.3= 2.38/arch/x86/kernel/microcode_intel.c ---- linux-2.6.32.38/arch/x86/kernel/microcode_intel.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/microcode_intel.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_intel.c linux-2.6.3= 2.39/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32.39/arch/x86/kernel/microcode_intel.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/microcode_intel.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod =20 static int get_ucode_user(void *to, const void *from, size_t n) @@ -14136,9 +14068,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/microc= ode_intel.c linux-2.6.32.38/arc { return µcode_intel_ops; } -diff -urNp linux-2.6.32.38/arch/x86/kernel/module.c linux-2.6.32.38/arch= /x86/kernel/module.c ---- linux-2.6.32.38/arch/x86/kernel/module.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/module.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/module.c linux-2.6.32.39/arch= /x86/kernel/module.c +--- linux-2.6.32.39/arch/x86/kernel/module.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/module.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -14279,9 +14211,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/module= .c linux-2.6.32.38/arch/x86/ker #if 0 if ((s64)val !=3D *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.32.38/arch/x86/kernel/paravirt.c linux-2.6.32.38/ar= ch/x86/kernel/paravirt.c ---- linux-2.6.32.38/arch/x86/kernel/paravirt.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/paravirt.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/paravirt.c linux-2.6.32.39/ar= ch/x86/kernel/paravirt.c +--- linux-2.6.32.39/arch/x86/kernel/paravirt.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/paravirt.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * corresponding structure. */ static void *get_call_destination(u8 type) @@ -14385,9 +14317,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/paravi= rt.c linux-2.6.32.38/arch/x86/k }; =20 EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.32.38/arch/x86/kernel/paravirt-spinlocks.c linux-2.= 6.32.38/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.32.38/arch/x86/kernel/paravirt-spinlocks.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c linux-2.= 6.32.39/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -14397,9 +14329,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/paravi= rt-spinlocks.c linux-2.6.32.38/ #ifdef CONFIG_SMP .spin_is_locked =3D __ticket_spin_is_locked, .spin_is_contended =3D __ticket_spin_is_contended, -diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-calgary_64.c linux-2.6.32= .38/arch/x86/kernel/pci-calgary_64.c ---- linux-2.6.32.38/arch/x86/kernel/pci-calgary_64.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c linux-2.6.32= .39/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:56:46= .000000000 -0400 @@ -477,7 +477,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -14409,9 +14341,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-ca= lgary_64.c linux-2.6.32.38/arch .alloc_coherent =3D calgary_alloc_coherent, .free_coherent =3D calgary_free_coherent, .map_sg =3D calgary_map_sg, -diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-dma.c linux-2.6.32.38/arc= h/x86/kernel/pci-dma.c ---- linux-2.6.32.38/arch/x86/kernel/pci-dma.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/pci-dma.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-dma.c linux-2.6.32.39/arc= h/x86/kernel/pci-dma.c +--- linux-2.6.32.39/arch/x86/kernel/pci-dma.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/pci-dma.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -14,7 +14,7 @@ =20 static int forbid_dac __read_mostly; @@ -14430,9 +14362,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-dm= a.c linux-2.6.32.38/arch/x86/ke =20 #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-gart_64.c linux-2.6.32.38= /arch/x86/kernel/pci-gart_64.c ---- linux-2.6.32.38/arch/x86/kernel/pci-gart_64.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c linux-2.6.32.39= /arch/x86/kernel/pci-gart_64.c +--- linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag return -1; } @@ -14442,9 +14374,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-ga= rt_64.c linux-2.6.32.38/arch/x8 .map_sg =3D gart_map_sg, .unmap_sg =3D gart_unmap_sg, .map_page =3D gart_map_page, -diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-nommu.c linux-2.6.32.38/a= rch/x86/kernel/pci-nommu.c ---- linux-2.6.32.38/arch/x86/kernel/pci-nommu.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/pci-nommu.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-nommu.c linux-2.6.32.39/a= rch/x86/kernel/pci-nommu.c +--- linux-2.6.32.39/arch/x86/kernel/pci-nommu.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/pci-nommu.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -14454,9 +14386,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-no= mmu.c linux-2.6.32.38/arch/x86/ .alloc_coherent =3D dma_generic_alloc_coherent, .free_coherent =3D nommu_free_coherent, .map_sg =3D nommu_map_sg, -diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.38= /arch/x86/kernel/pci-swiotlb.c ---- linux-2.6.32.38/arch/x86/kernel/pci-swiotlb.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.39= /arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -14466,9 +14398,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-sw= iotlb.c linux-2.6.32.38/arch/x8 .mapping_error =3D swiotlb_dma_mapping_error, .alloc_coherent =3D x86_swiotlb_alloc_coherent, .free_coherent =3D swiotlb_free_coherent, -diff -urNp linux-2.6.32.38/arch/x86/kernel/process_32.c linux-2.6.32.38/= arch/x86/kernel/process_32.c ---- linux-2.6.32.38/arch/x86/kernel/process_32.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/process_32.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/process_32.c linux-2.6.32.39/= arch/x86/kernel/process_32.c +--- linux-2.6.32.39/arch/x86/kernel/process_32.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/process_32.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -14562,9 +14494,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/proces= s_32.c linux-2.6.32.38/arch/x86 return 0; } - -diff -urNp linux-2.6.32.38/arch/x86/kernel/process_64.c linux-2.6.32.38/= arch/x86/kernel/process_64.c ---- linux-2.6.32.38/arch/x86/kernel/process_64.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/process_64.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/process_64.c linux-2.6.32.39/= arch/x86/kernel/process_64.c +--- linux-2.6.32.39/arch/x86/kernel/process_64.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/process_64.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -14630,9 +14562,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/proces= s_64.c linux-2.6.32.38/arch/x86 return 0; ip =3D *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.32.38/arch/x86/kernel/process.c linux-2.6.32.38/arc= h/x86/kernel/process.c ---- linux-2.6.32.38/arch/x86/kernel/process.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/process.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/process.c linux-2.6.32.39/arc= h/x86/kernel/process.c +--- linux-2.6.32.39/arch/x86/kernel/process.c 2011-04-22 19:16:29.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/process.c 2011-04-23 13:27:33.000000= 000 -0400 @@ -51,16 +51,33 @@ void free_thread_xstate(struct task_stru =20 void free_thread_info(struct thread_info *ti) @@ -14645,13 +14577,15 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/proc= ess.c linux-2.6.32.38/arch/x86/ke + void arch_task_cache_init(void) { -+ /* create a slab on which task structs can be allocated */ +- task_xstate_cachep =3D +- kmem_cache_create("task_xstate", xstate_size, ++ /* create a slab on which task_structs can be allocated */ + task_struct_cachep =3D + kmem_cache_create("task_struct", sizeof(struct task_struct), + ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); + - task_xstate_cachep =3D - kmem_cache_create("task_xstate", xstate_size, ++ task_xstate_cachep =3D ++ kmem_cache_create("task_xstate", xstate_size, __alignof__(union thread_xstate), - SLAB_PANIC | SLAB_NOTRACK, NULL); + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL); @@ -14688,7 +14622,7 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/proces= s.c linux-2.6.32.38/arch/x86/ke tsk->thread.debugreg0 =3D 0; tsk->thread.debugreg1 =3D 0; tsk->thread.debugreg2 =3D 0; -@@ -603,16 +623,32 @@ static int __init idle_setup(char *str) +@@ -568,16 +588,32 @@ static int __init idle_setup(char *str) } early_param("idle", idle_setup); =20 @@ -14730,9 +14664,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/proces= s.c linux-2.6.32.38/arch/x86/ke } +#endif =20 -diff -urNp linux-2.6.32.38/arch/x86/kernel/ptrace.c linux-2.6.32.38/arch= /x86/kernel/ptrace.c ---- linux-2.6.32.38/arch/x86/kernel/ptrace.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/ptrace.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/ptrace.c linux-2.6.32.39/arch= /x86/kernel/ptrace.c +--- linux-2.6.32.39/arch/x86/kernel/ptrace.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/ptrace.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -925,7 +925,7 @@ static const struct user_regset_view use long arch_ptrace(struct task_struct *child, long request, long addr, lo= ng data) { @@ -14819,9 +14753,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/ptrace= .c linux-2.6.32.38/arch/x86/ker { if (unlikely(current->audit_context)) audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); -diff -urNp linux-2.6.32.38/arch/x86/kernel/reboot.c linux-2.6.32.38/arch= /x86/kernel/reboot.c ---- linux-2.6.32.38/arch/x86/kernel/reboot.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/reboot.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/reboot.c linux-2.6.32.39/arch= /x86/kernel/reboot.c +--- linux-2.6.32.39/arch/x86/kernel/reboot.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/reboot.c 2011-04-23 12:56:10.0000000= 00 -0400 @@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); =20 @@ -14831,15 +14765,6 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/reboo= t.c linux-2.6.32.38/arch/x86/ker enum reboot_type reboot_type =3D BOOT_KBD; int reboot_force; =20 -@@ -276,7 +276,7 @@ static struct dmi_system_id __initdata r - DMI_MATCH(DMI_BOARD_NAME, "P4S800"), - }, - }, -- { } -+ { NULL, NULL, {{0, {0}}}, NULL} - }; -=20 - static int __init reboot_init(void) @@ -292,12 +292,12 @@ core_initcall(reboot_init); controller to pulse the CPU reset line, which is more thorough, but doesn't work with at least one type of 486 motherboard. It is easy @@ -14898,9 +14823,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/reboot= .c linux-2.6.32.38/arch/x86/ker =20 /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.32.38/arch/x86/kernel/setup.c linux-2.6.32.38/arch/= x86/kernel/setup.c ---- linux-2.6.32.38/arch/x86/kernel/setup.c 2011-04-17 17:00:52.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/setup.c 2011-04-17 17:03:05.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/setup.c linux-2.6.32.39/arch/= x86/kernel/setup.c +--- linux-2.6.32.39/arch/x86/kernel/setup.c 2011-04-17 17:00:52.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/setup.c 2011-04-17 17:03:05.00000000= 0 -0400 @@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p) =20 if (!boot_params.hdr.root_flags) @@ -14921,9 +14846,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/setup.= c linux-2.6.32.38/arch/x86/kern data_resource.end =3D virt_to_phys(_edata)-1; bss_resource.start =3D virt_to_phys(&__bss_start); bss_resource.end =3D virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.32.38/arch/x86/kernel/setup_percpu.c linux-2.6.32.3= 8/arch/x86/kernel/setup_percpu.c ---- linux-2.6.32.38/arch/x86/kernel/setup_percpu.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/setup_percpu.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/setup_percpu.c linux-2.6.32.3= 9/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32.39/arch/x86/kernel/setup_percpu.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/setup_percpu.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -14987,9 +14912,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/setup_= percpu.c linux-2.6.32.38/arch/x /* * Up to this point, the boot CPU has been using .data.init * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.32.38/arch/x86/kernel/signal.c linux-2.6.32.38/arch= /x86/kernel/signal.c ---- linux-2.6.32.38/arch/x86/kernel/signal.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/signal.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/signal.c linux-2.6.32.39/arch= /x86/kernel/signal.c +--- linux-2.6.32.39/arch/x86/kernel/signal.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/signal.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) =3D=3D 0. @@ -15064,9 +14989,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/signal= .c linux-2.6.32.38/arch/x86/ker return; =20 if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.32.38/arch/x86/kernel/smpboot.c linux-2.6.32.38/arc= h/x86/kernel/smpboot.c ---- linux-2.6.32.38/arch/x86/kernel/smpboot.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/smpboot.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/smpboot.c linux-2.6.32.39/arc= h/x86/kernel/smpboot.c +--- linux-2.6.32.39/arch/x86/kernel/smpboot.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/smpboot.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct */ static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex); @@ -15124,9 +15049,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/smpboo= t.c linux-2.6.32.38/arch/x86/ke err =3D do_boot_cpu(apicid, cpu); =20 if (err) { -diff -urNp linux-2.6.32.38/arch/x86/kernel/step.c linux-2.6.32.38/arch/x= 86/kernel/step.c ---- linux-2.6.32.38/arch/x86/kernel/step.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/kernel/step.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/step.c linux-2.6.32.39/arch/x= 86/kernel/step.c +--- linux-2.6.32.39/arch/x86/kernel/step.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/kernel/step.c 2011-04-17 15:56:46.000000000= -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -15169,17 +15094,17 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/step= .c linux-2.6.32.38/arch/x86/kerne /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.32.38/arch/x86/kernel/syscall_table_32.S linux-2.6.= 32.38/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.32.38/arch/x86/kernel/syscall_table_32.S 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S linux-2.6.= 32.39/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:56:= 46.000000000 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for r= estarting */ .long sys_exit -diff -urNp linux-2.6.32.38/arch/x86/kernel/sys_i386_32.c linux-2.6.32.38= /arch/x86/kernel/sys_i386_32.c ---- linux-2.6.32.38/arch/x86/kernel/sys_i386_32.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c linux-2.6.32.39= /arch/x86/kernel/sys_i386_32.c +--- linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -24,6 +24,21 @@ =20 #include @@ -15451,9 +15376,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/sys_i3= 86_32.c linux-2.6.32.38/arch/x8 - : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory= "); - return __res; -} -diff -urNp linux-2.6.32.38/arch/x86/kernel/sys_x86_64.c linux-2.6.32.38/= arch/x86/kernel/sys_x86_64.c ---- linux-2.6.32.38/arch/x86/kernel/sys_x86_64.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c linux-2.6.32.39/= arch/x86/kernel/sys_x86_64.c +--- linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -15591,9 +15516,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/sys_x8= 6_64.c linux-2.6.32.38/arch/x86 mm->cached_hole_size =3D ~0UL; =20 return addr; -diff -urNp linux-2.6.32.38/arch/x86/kernel/time.c linux-2.6.32.38/arch/x= 86/kernel/time.c ---- linux-2.6.32.38/arch/x86/kernel/time.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/kernel/time.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/time.c linux-2.6.32.39/arch/x= 86/kernel/time.c +--- linux-2.6.32.39/arch/x86/kernel/time.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/kernel/time.c 2011-04-17 15:56:46.000000000= -0400 @@ -26,17 +26,13 @@ int timer_ack; #endif @@ -15632,9 +15557,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/time.c= linux-2.6.32.38/arch/x86/kerne } return pc; } -diff -urNp linux-2.6.32.38/arch/x86/kernel/tls.c linux-2.6.32.38/arch/x8= 6/kernel/tls.c ---- linux-2.6.32.38/arch/x86/kernel/tls.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/kernel/tls.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/tls.c linux-2.6.32.39/arch/x8= 6/kernel/tls.c +--- linux-2.6.32.39/arch/x86/kernel/tls.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/kernel/tls.c 2011-04-17 15:56:46.000000000 = -0400 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; @@ -15647,9 +15572,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/tls.c = linux-2.6.32.38/arch/x86/kernel set_tls_desc(p, idx, &info, 1); =20 return 0; -diff -urNp linux-2.6.32.38/arch/x86/kernel/trampoline_32.S linux-2.6.32.= 38/arch/x86/kernel/trampoline_32.S ---- linux-2.6.32.38/arch/x86/kernel/trampoline_32.S 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/trampoline_32.S 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/trampoline_32.S linux-2.6.32.= 39/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32.39/arch/x86/kernel/trampoline_32.S 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/trampoline_32.S 2011-04-17 15:56:46.= 000000000 -0400 @@ -32,6 +32,12 @@ #include #include @@ -15672,9 +15597,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/trampo= line_32.S linux-2.6.32.38/arch/ =20 # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -diff -urNp linux-2.6.32.38/arch/x86/kernel/trampoline_64.S linux-2.6.32.= 38/arch/x86/kernel/trampoline_64.S ---- linux-2.6.32.38/arch/x86/kernel/trampoline_64.S 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/trampoline_64.S 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/trampoline_64.S linux-2.6.32.= 39/arch/x86/kernel/trampoline_64.S +--- linux-2.6.32.39/arch/x86/kernel/trampoline_64.S 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/trampoline_64.S 2011-04-17 15:56:46.= 000000000 -0400 @@ -91,7 +91,7 @@ startup_32: movl $__KERNEL_DS, %eax # Initialize the %ds segment register movl %eax, %ds @@ -15693,9 +15618,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/trampo= line_64.S linux-2.6.32.38/arch/ .long tgdt - r_base .short 0 .quad 0x00cf9b000000ffff # __KERNEL32_CS -diff -urNp linux-2.6.32.38/arch/x86/kernel/traps.c linux-2.6.32.38/arch/= x86/kernel/traps.c ---- linux-2.6.32.38/arch/x86/kernel/traps.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/traps.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/traps.c linux-2.6.32.39/arch/= x86/kernel/traps.c +--- linux-2.6.32.39/arch/x86/kernel/traps.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/traps.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -69,12 +69,6 @@ asmlinkage int system_call(void); =20 /* Do we ignore FPU interrupts ? */ @@ -15864,21 +15789,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/traps= .c linux-2.6.32.38/arch/x86/kern =20 if (!tsk_used_math(tsk)) { local_irq_enable(); -diff -urNp linux-2.6.32.38/arch/x86/kernel/tsc.c linux-2.6.32.38/arch/x8= 6/kernel/tsc.c ---- linux-2.6.32.38/arch/x86/kernel/tsc.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/kernel/tsc.c 2011-04-17 15:56:46.000000000 = -0400 -@@ -838,7 +838,7 @@ static struct dmi_system_id __initdata b - DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), - }, - }, -- {} -+ { NULL, NULL, {{0, {0}}}, NULL} - }; -=20 - static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.32.38/arch/x86/kernel/vm86_32.c linux-2.6.32.38/arc= h/x86/kernel/vm86_32.c ---- linux-2.6.32.38/arch/x86/kernel/vm86_32.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/vm86_32.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/vm86_32.c linux-2.6.32.39/arc= h/x86/kernel/vm86_32.c +--- linux-2.6.32.39/arch/x86/kernel/vm86_32.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/vm86_32.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -41,6 +41,7 @@ #include #include @@ -15943,9 +15856,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/vm86_3= 2.c linux-2.6.32.38/arch/x86/ke if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) =3D=3D BIOSSEG) -diff -urNp linux-2.6.32.38/arch/x86/kernel/vmi_32.c linux-2.6.32.38/arch= /x86/kernel/vmi_32.c ---- linux-2.6.32.38/arch/x86/kernel/vmi_32.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/vmi_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/vmi_32.c linux-2.6.32.39/arch= /x86/kernel/vmi_32.c +--- linux-2.6.32.39/arch/x86/kernel/vmi_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/vmi_32.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))=20 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); =20 @@ -16108,9 +16021,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/vmi_32= .c linux-2.6.32.38/arch/x86/ker return; =20 local_irq_save(flags); -diff -urNp linux-2.6.32.38/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.38= /arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.32.38/arch/x86/kernel/vmlinux.lds.S 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.39= /arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:56:46.00= 0000000 -0400 @@ -26,6 +26,13 @@ #include #include @@ -16403,9 +16316,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/vmlinu= x.lds.S linux-2.6.32.38/arch/x8 "kernel image bigger than KERNEL_IMAGE_SIZE"); =20 #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.38/arch/x86/kernel/vsyscall_64.c linux-2.6.32.38= /arch/x86/kernel/vsyscall_64.c ---- linux-2.6.32.38/arch/x86/kernel/vsyscall_64.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/vsyscall_64.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c linux-2.6.32.39= /arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c 2011-04-23 12:56:10.00= 0000000 -0400 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa =20 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -16423,25 +16336,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/vsysc= all_64.c linux-2.6.32.38/arch/x8 p =3D tcache->blob[1]; } else if (__vgetcpu_mode =3D=3D VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ -@@ -234,13 +235,13 @@ static ctl_table kernel_table2[] =3D { - .data =3D &vsyscall_gtod_data.sysctl_enabled, .maxlen =3D sizeof(int= ), - .mode =3D 0644, - .proc_handler =3D proc_dointvec }, -- {} -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static ctl_table kernel_root_table2[] =3D { - { .ctl_name =3D CTL_KERN, .procname =3D "kernel", .mode =3D 0555, - .child =3D kernel_table2 }, -- {} -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; - #endif -=20 -diff -urNp linux-2.6.32.38/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32= .38/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.32.38/arch/x86/kernel/x8664_ksyms_64.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32= .39/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:56:46= .000000000 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); =20 EXPORT_SYMBOL(copy_user_generic); @@ -16451,9 +16348,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/x8664_= ksyms_64.c linux-2.6.32.38/arch EXPORT_SYMBOL(__copy_from_user_inatomic); =20 EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.32.38/arch/x86/kernel/xsave.c linux-2.6.32.38/arch/= x86/kernel/xsave.c ---- linux-2.6.32.38/arch/x86/kernel/xsave.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/x86/kernel/xsave.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/x86/kernel/xsave.c linux-2.6.32.39/arch/= x86/kernel/xsave.c +--- linux-2.6.32.39/arch/x86/kernel/xsave.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/x86/kernel/xsave.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -1; @@ -16481,9 +16378,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/xsave.= c linux-2.6.32.38/arch/x86/kern buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.32.38/arch/x86/kvm/emulate.c linux-2.6.32.38/arch/x= 86/kvm/emulate.c ---- linux-2.6.32.38/arch/x86/kvm/emulate.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/kvm/emulate.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/kvm/emulate.c linux-2.6.32.39/arch/x= 86/kvm/emulate.c +--- linux-2.6.32.39/arch/x86/kvm/emulate.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/kvm/emulate.c 2011-04-17 15:56:46.000000000= -0400 @@ -81,8 +81,8 @@ #define Src2CL (1<<29) #define Src2ImmByte (2<<29) @@ -16520,9 +16417,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/emulate.c= linux-2.6.32.38/arch/x86/kvm/e switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ -diff -urNp linux-2.6.32.38/arch/x86/kvm/lapic.c linux-2.6.32.38/arch/x86= /kvm/lapic.c ---- linux-2.6.32.38/arch/x86/kvm/lapic.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/arch/x86/kvm/lapic.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/arch/x86/kvm/lapic.c linux-2.6.32.39/arch/x86= /kvm/lapic.c +--- linux-2.6.32.39/arch/x86/kvm/lapic.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/arch/x86/kvm/lapic.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -52,7 +52,7 @@ #define APIC_BUS_CYCLE_NS 1 =20 @@ -16532,9 +16429,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/lapic.c l= inux-2.6.32.38/arch/x86/kvm/lap =20 #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-2.6.32.38/arch/x86/kvm/svm.c linux-2.6.32.38/arch/x86/k= vm/svm.c ---- linux-2.6.32.38/arch/x86/kvm/svm.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/arch/x86/kvm/svm.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/arch/x86/kvm/svm.c linux-2.6.32.39/arch/x86/k= vm/svm.c +--- linux-2.6.32.39/arch/x86/kvm/svm.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/arch/x86/kvm/svm.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -2483,9 +2483,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { @@ -16558,9 +16455,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/svm.c lin= ux-2.6.32.38/arch/x86/kvm/svm.c .cpu_has_kvm_support =3D has_svm, .disabled_by_bios =3D is_disabled, .hardware_setup =3D svm_hardware_setup, -diff -urNp linux-2.6.32.38/arch/x86/kvm/vmx.c linux-2.6.32.38/arch/x86/k= vm/vmx.c ---- linux-2.6.32.38/arch/x86/kvm/vmx.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/arch/x86/kvm/vmx.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/arch/x86/kvm/vmx.c linux-2.6.32.39/arch/x86/k= vm/vmx.c +--- linux-2.6.32.39/arch/x86/kvm/vmx.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/arch/x86/kvm/vmx.c 2011-04-23 12:56:10.000000000 -04= 00 @@ -570,7 +570,11 @@ static void reload_tss(void) =20 kvm_get_gdt(&gdt); @@ -16624,16 +16521,25 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/vmx.c l= inux-2.6.32.38/arch/x86/kvm/vmx.c #ifdef CONFIG_X86_64 , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" #endif -@@ -3781,7 +3799,7 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3781,7 +3799,16 @@ static void vmx_vcpu_run(struct kvm_vcpu if (vmx->rmode.irq.pending) fixup_rmode_irq(vmx); =20 - asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS)); + asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS)); ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ asm("mov %0, %%fs" : : "r"(__KERNEL_PERCPU)); ++#endif ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ __set_fs(current_thread_info()->addr_limit); ++#endif ++ vmx->launched =3D 1; =20 vmx_complete_interrupts(vmx); -@@ -3956,7 +3974,7 @@ static bool vmx_gb_page_enable(void) +@@ -3956,7 +3983,7 @@ static bool vmx_gb_page_enable(void) return false; } =20 @@ -16642,10 +16548,10 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/vmx.c l= inux-2.6.32.38/arch/x86/kvm/vmx.c .cpu_has_kvm_support =3D cpu_has_kvm_support, .disabled_by_bios =3D vmx_disabled_by_bios, .hardware_setup =3D hardware_setup, -diff -urNp linux-2.6.32.38/arch/x86/kvm/x86.c linux-2.6.32.38/arch/x86/k= vm/x86.c ---- linux-2.6.32.38/arch/x86/kvm/x86.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/arch/x86/kvm/x86.c 2011-04-17 15:56:46.000000000 -04= 00 -@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct=20 +diff -urNp linux-2.6.32.39/arch/x86/kvm/x86.c linux-2.6.32.39/arch/x86/k= vm/x86.c +--- linux-2.6.32.39/arch/x86/kvm/x86.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/arch/x86/kvm/x86.c 2011-04-23 12:56:10.000000000 -04= 00 +@@ -81,7 +81,7 @@ static void update_cr8_intercept(struct=20 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); =20 @@ -16654,77 +16560,55 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/x86.c l= inux-2.6.32.38/arch/x86/kvm/x86.c EXPORT_SYMBOL_GPL(kvm_x86_ops); =20 int ignore_msrs =3D 0; - module_param_named(ignore_msrs, ignore_msrs, bool, S_IRUGO | S_IWUSR); -=20 - struct kvm_stats_debugfs_item debugfs_entries[] =3D { -- { "pf_fixed", VCPU_STAT(pf_fixed) }, -- { "pf_guest", VCPU_STAT(pf_guest) }, -- { "tlb_flush", VCPU_STAT(tlb_flush) }, -- { "invlpg", VCPU_STAT(invlpg) }, -- { "exits", VCPU_STAT(exits) }, -- { "io_exits", VCPU_STAT(io_exits) }, -- { "mmio_exits", VCPU_STAT(mmio_exits) }, -- { "signal_exits", VCPU_STAT(signal_exits) }, -- { "irq_window", VCPU_STAT(irq_window_exits) }, -- { "nmi_window", VCPU_STAT(nmi_window_exits) }, -- { "halt_exits", VCPU_STAT(halt_exits) }, -- { "halt_wakeup", VCPU_STAT(halt_wakeup) }, -- { "hypercalls", VCPU_STAT(hypercalls) }, -- { "request_irq", VCPU_STAT(request_irq_exits) }, -- { "irq_exits", VCPU_STAT(irq_exits) }, -- { "host_state_reload", VCPU_STAT(host_state_reload) }, -- { "efer_reload", VCPU_STAT(efer_reload) }, -- { "fpu_reload", VCPU_STAT(fpu_reload) }, -- { "insn_emulation", VCPU_STAT(insn_emulation) }, -- { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail) }, -- { "irq_injections", VCPU_STAT(irq_injections) }, -- { "nmi_injections", VCPU_STAT(nmi_injections) }, -- { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped) }, -- { "mmu_pte_write", VM_STAT(mmu_pte_write) }, -- { "mmu_pte_updated", VM_STAT(mmu_pte_updated) }, -- { "mmu_pde_zapped", VM_STAT(mmu_pde_zapped) }, -- { "mmu_flooded", VM_STAT(mmu_flooded) }, -- { "mmu_recycled", VM_STAT(mmu_recycled) }, -- { "mmu_cache_miss", VM_STAT(mmu_cache_miss) }, -- { "mmu_unsync", VM_STAT(mmu_unsync) }, -- { "remote_tlb_flush", VM_STAT(remote_tlb_flush) }, -- { "largepages", VM_STAT(lpages) }, -+ { "pf_fixed", VCPU_STAT(pf_fixed), NULL }, -+ { "pf_guest", VCPU_STAT(pf_guest), NULL }, -+ { "tlb_flush", VCPU_STAT(tlb_flush), NULL }, -+ { "invlpg", VCPU_STAT(invlpg), NULL }, -+ { "exits", VCPU_STAT(exits), NULL }, -+ { "io_exits", VCPU_STAT(io_exits), NULL }, -+ { "mmio_exits", VCPU_STAT(mmio_exits), NULL }, -+ { "signal_exits", VCPU_STAT(signal_exits), NULL }, -+ { "irq_window", VCPU_STAT(irq_window_exits), NULL }, -+ { "nmi_window", VCPU_STAT(nmi_window_exits), NULL }, -+ { "halt_exits", VCPU_STAT(halt_exits), NULL }, -+ { "halt_wakeup", VCPU_STAT(halt_wakeup), NULL }, -+ { "hypercalls", VCPU_STAT(hypercalls), NULL }, -+ { "request_irq", VCPU_STAT(request_irq_exits), NULL }, -+ { "irq_exits", VCPU_STAT(irq_exits), NULL }, -+ { "host_state_reload", VCPU_STAT(host_state_reload), NULL }, -+ { "efer_reload", VCPU_STAT(efer_reload), NULL }, -+ { "fpu_reload", VCPU_STAT(fpu_reload), NULL }, -+ { "insn_emulation", VCPU_STAT(insn_emulation), NULL }, -+ { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail), NULL }, -+ { "irq_injections", VCPU_STAT(irq_injections), NULL }, -+ { "nmi_injections", VCPU_STAT(nmi_injections), NULL }, -+ { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped), NULL }, -+ { "mmu_pte_write", VM_STAT(mmu_pte_write), NULL }, -+ { "mmu_pte_updated", VM_STAT(mmu_pte_updated), NULL }, -+ { "mmu_pde_zapped", VM_STAT(mmu_pde_zapped), NULL }, -+ { "mmu_flooded", VM_STAT(mmu_flooded), NULL }, -+ { "mmu_recycled", VM_STAT(mmu_recycled), NULL }, -+ { "mmu_cache_miss", VM_STAT(mmu_cache_miss), NULL }, -+ { "mmu_unsync", VM_STAT(mmu_unsync), NULL }, -+ { "remote_tlb_flush", VM_STAT(remote_tlb_flush), NULL }, -+ { "largepages", VM_STAT(lpages), NULL }, - { NULL } - }; -=20 -@@ -1638,7 +1638,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru +@@ -1390,15 +1390,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str + struct kvm_cpuid2 *cpuid, + struct kvm_cpuid_entry2 __user *entries) + { +- int r; ++ int r, i; +=20 + r =3D -E2BIG; + if (cpuid->nent > KVM_MAX_CPUID_ENTRIES) + goto out; + r =3D -EFAULT; +- if (copy_from_user(&vcpu->arch.cpuid_entries, entries, +- cpuid->nent * sizeof(struct kvm_cpuid_entry2))) ++ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_c= puid_entry2))) + goto out; ++ for (i =3D 0; i < cpuid->nent; ++i) { ++ struct kvm_cpuid_entry2 cpuid_entry; ++ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry))) ++ goto out; ++ vcpu->arch.cpuid_entries[i] =3D cpuid_entry; ++ } + vcpu->arch.cpuid_nent =3D cpuid->nent; + kvm_apic_set_version(vcpu); + return 0; +@@ -1411,16 +1416,20 @@ static int kvm_vcpu_ioctl_get_cpuid2(str + struct kvm_cpuid2 *cpuid, + struct kvm_cpuid_entry2 __user *entries) + { +- int r; ++ int r, i; +=20 + vcpu_load(vcpu); + r =3D -E2BIG; + if (cpuid->nent < vcpu->arch.cpuid_nent) + goto out; + r =3D -EFAULT; +- if (copy_to_user(entries, &vcpu->arch.cpuid_entries, +- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) ++ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(s= truct kvm_cpuid_entry2))) + goto out; ++ for (i =3D 0; i < vcpu->arch.cpuid_nent; ++i) { ++ struct kvm_cpuid_entry2 cpuid_entry =3D vcpu->arch.cpuid_entries[i]; ++ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry))) ++ goto out; ++ } + return 0; +=20 + out: +@@ -1638,7 +1647,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { @@ -16733,7 +16617,7 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/x86.c lin= ux-2.6.32.38/arch/x86/kvm/x86.c return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; -@@ -3220,10 +3220,10 @@ static struct notifier_block kvmclock_cp +@@ -3220,10 +3229,10 @@ static struct notifier_block kvmclock_cp .notifier_call =3D kvmclock_cpufreq_notifier }; =20 @@ -16746,9 +16630,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/x86.c lin= ux-2.6.32.38/arch/x86/kvm/x86.c =20 if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.32.38/arch/x86/lib/checksum_32.S linux-2.6.32.38/ar= ch/x86/lib/checksum_32.S ---- linux-2.6.32.38/arch/x86/lib/checksum_32.S 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/lib/checksum_32.S 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/checksum_32.S linux-2.6.32.39/ar= ch/x86/lib/checksum_32.S +--- linux-2.6.32.39/arch/x86/lib/checksum_32.S 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/lib/checksum_32.S 2011-04-17 15:56:46.00000= 0000 -0400 @@ -28,7 +28,8 @@ #include #include @@ -17009,9 +16893,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/checksum_= 32.S linux-2.6.32.38/arch/x86/l =09 #undef ROUND #undef ROUND1 =09 -diff -urNp linux-2.6.32.38/arch/x86/lib/clear_page_64.S linux-2.6.32.38/= arch/x86/lib/clear_page_64.S ---- linux-2.6.32.38/arch/x86/lib/clear_page_64.S 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/lib/clear_page_64.S 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/clear_page_64.S linux-2.6.32.39/= arch/x86/lib/clear_page_64.S +--- linux-2.6.32.39/arch/x86/lib/clear_page_64.S 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/lib/clear_page_64.S 2011-04-17 15:56:46.000= 000000 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) =20 #include @@ -17021,9 +16905,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/clear_pag= e_64.S linux-2.6.32.38/arch/x86 1: .byte 0xeb /* jmp */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.38/arch/x86/lib/copy_page_64.S linux-2.6.32.38/a= rch/x86/lib/copy_page_64.S ---- linux-2.6.32.38/arch/x86/lib/copy_page_64.S 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/lib/copy_page_64.S 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/copy_page_64.S linux-2.6.32.39/a= rch/x86/lib/copy_page_64.S +--- linux-2.6.32.39/arch/x86/lib/copy_page_64.S 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/lib/copy_page_64.S 2011-04-17 15:56:46.0000= 00000 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) =20 #include @@ -17033,9 +16917,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/copy_page= _64.S linux-2.6.32.38/arch/x86/ 1: .byte 0xeb /* jmp */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.38/arch/x86/lib/copy_user_64.S linux-2.6.32.38/a= rch/x86/lib/copy_user_64.S ---- linux-2.6.32.38/arch/x86/lib/copy_user_64.S 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/lib/copy_user_64.S 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/copy_user_64.S linux-2.6.32.39/a= rch/x86/lib/copy_user_64.S +--- linux-2.6.32.39/arch/x86/lib/copy_user_64.S 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/lib/copy_user_64.S 2011-04-17 15:56:46.0000= 00000 -0400 @@ -15,13 +15,14 @@ #include #include @@ -17104,9 +16988,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/copy_user= _64.S linux-2.6.32.38/arch/x86/ movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.32.38/arch/x86/lib/copy_user_nocache_64.S linux-2.6= .32.38/arch/x86/lib/copy_user_nocache_64.S ---- linux-2.6.32.38/arch/x86/lib/copy_user_nocache_64.S 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S linux-2.6= .32.39/arch/x86/lib/copy_user_nocache_64.S +--- linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:56= :46.000000000 -0400 @@ -14,6 +14,7 @@ #include #include @@ -17131,9 +17015,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/copy_user= _nocache_64.S linux-2.6.32.38/a cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION -diff -urNp linux-2.6.32.38/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.= 38/arch/x86/lib/csum-wrappers_64.c ---- linux-2.6.32.38/arch/x86/lib/csum-wrappers_64.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/lib/csum-wrappers_64.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.= 39/arch/x86/lib/csum-wrappers_64.c +--- linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ len -=3D 2; } @@ -17152,9 +17036,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/csum-wrap= pers_64.c linux-2.6.32.38/arch/ return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } -diff -urNp linux-2.6.32.38/arch/x86/lib/getuser.S linux-2.6.32.38/arch/x= 86/lib/getuser.S ---- linux-2.6.32.38/arch/x86/lib/getuser.S 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/lib/getuser.S 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/getuser.S linux-2.6.32.39/arch/x= 86/lib/getuser.S +--- linux-2.6.32.39/arch/x86/lib/getuser.S 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/lib/getuser.S 2011-04-17 15:56:46.000000000= -0400 @@ -33,14 +33,35 @@ #include #include @@ -17260,9 +17144,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/getuser.S= linux-2.6.32.38/arch/x86/lib/g 4: movq -7(%_ASM_AX),%_ASM_DX xor %eax,%eax ret -diff -urNp linux-2.6.32.38/arch/x86/lib/memcpy_64.S linux-2.6.32.38/arch= /x86/lib/memcpy_64.S ---- linux-2.6.32.38/arch/x86/lib/memcpy_64.S 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/lib/memcpy_64.S 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/memcpy_64.S linux-2.6.32.39/arch= /x86/lib/memcpy_64.S +--- linux-2.6.32.39/arch/x86/lib/memcpy_64.S 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/lib/memcpy_64.S 2011-04-17 15:56:46.0000000= 00 -0400 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -17272,9 +17156,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/memcpy_64= .S linux-2.6.32.38/arch/x86/lib 1: .byte 0xeb /* jmp */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.38/arch/x86/lib/memset_64.S linux-2.6.32.38/arch= /x86/lib/memset_64.S ---- linux-2.6.32.38/arch/x86/lib/memset_64.S 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/lib/memset_64.S 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/memset_64.S linux-2.6.32.39/arch= /x86/lib/memset_64.S +--- linux-2.6.32.39/arch/x86/lib/memset_64.S 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/lib/memset_64.S 2011-04-17 15:56:46.0000000= 00 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) =20 #include @@ -17284,9 +17168,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/memset_64= .S linux-2.6.32.38/arch/x86/lib 1: .byte 0xeb /* jmp */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.38/arch/x86/lib/mmx_32.c linux-2.6.32.38/arch/x8= 6/lib/mmx_32.c ---- linux-2.6.32.38/arch/x86/lib/mmx_32.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/lib/mmx_32.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/mmx_32.c linux-2.6.32.39/arch/x8= 6/lib/mmx_32.c +--- linux-2.6.32.39/arch/x86/lib/mmx_32.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/lib/mmx_32.c 2011-04-17 15:56:46.000000000 = -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -17602,9 +17486,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/mmx_32.c = linux-2.6.32.38/arch/x86/lib/mm =20 from +=3D 64; to +=3D 64; -diff -urNp linux-2.6.32.38/arch/x86/lib/putuser.S linux-2.6.32.38/arch/x= 86/lib/putuser.S ---- linux-2.6.32.38/arch/x86/lib/putuser.S 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/lib/putuser.S 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/putuser.S linux-2.6.32.39/arch/x= 86/lib/putuser.S +--- linux-2.6.32.39/arch/x86/lib/putuser.S 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/lib/putuser.S 2011-04-17 15:56:46.000000000= -0400 @@ -15,7 +15,8 @@ #include #include @@ -17742,9 +17626,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/putuser.S= linux-2.6.32.38/arch/x86/lib/p #endif xor %eax,%eax EXIT -diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_32.c linux-2.6.32.38/ar= ch/x86/lib/usercopy_32.c ---- linux-2.6.32.38/arch/x86/lib/usercopy_32.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/lib/usercopy_32.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/usercopy_32.c linux-2.6.32.39/ar= ch/x86/lib/usercopy_32.c +--- linux-2.6.32.39/arch/x86/lib/usercopy_32.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/lib/usercopy_32.c 2011-04-23 21:12:28.00000= 0000 -0400 @@ -43,7 +43,7 @@ do { \ __asm__ __volatile__( \ " testl %1,%1\n" \ @@ -18266,7 +18150,7 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_= 32.c linux-2.6.32.38/arch/x86/l return n; } EXPORT_SYMBOL(__copy_from_user_ll_nozero); -@@ -827,59 +943,37 @@ unsigned long __copy_from_user_ll_nocach +@@ -827,59 +943,38 @@ unsigned long __copy_from_user_ll_nocach if (n > 64 && cpu_has_xmm2) n =3D __copy_user_intel_nocache(to, from, n); else @@ -18317,6 +18201,7 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_= 32.c linux-2.6.32.38/arch/x86/l + return; } -EXPORT_SYMBOL(copy_to_user); ++EXPORT_SYMBOL(__set_fs); =20 -/** - * copy_from_user: - Copy a block of data from user space. @@ -18349,9 +18234,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_= 32.c linux-2.6.32.38/arch/x86/l -EXPORT_SYMBOL(copy_from_user); +EXPORT_SYMBOL(set_fs); +#endif -diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_64.c linux-2.6.32.38/ar= ch/x86/lib/usercopy_64.c ---- linux-2.6.32.38/arch/x86/lib/usercopy_64.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/lib/usercopy_64.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/lib/usercopy_64.c linux-2.6.32.39/ar= ch/x86/lib/usercopy_64.c +--- linux-2.6.32.39/arch/x86/lib/usercopy_64.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/lib/usercopy_64.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -42,6 +42,8 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -18388,9 +18273,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_= 64.c linux-2.6.32.38/arch/x86/l } EXPORT_SYMBOL(copy_in_user); =20 -diff -urNp linux-2.6.32.38/arch/x86/Makefile linux-2.6.32.38/arch/x86/Ma= kefile ---- linux-2.6.32.38/arch/x86/Makefile 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/arch/x86/Makefile 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/arch/x86/Makefile linux-2.6.32.39/arch/x86/Ma= kefile +--- linux-2.6.32.39/arch/x86/Makefile 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/arch/x86/Makefile 2011-04-17 15:56:46.000000000 -040= 0 @@ -189,3 +189,12 @@ define archhelp echo ' FDARGS=3D"..." arguments for the booted ker= nel' echo ' FDINITRD=3Dfile initrd for the booted kernel= ' @@ -18404,9 +18289,9 @@ diff -urNp linux-2.6.32.38/arch/x86/Makefile linu= x-2.6.32.38/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.32.38/arch/x86/mm/extable.c linux-2.6.32.38/arch/x8= 6/mm/extable.c ---- linux-2.6.32.38/arch/x86/mm/extable.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/mm/extable.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/extable.c linux-2.6.32.39/arch/x8= 6/mm/extable.c +--- linux-2.6.32.39/arch/x86/mm/extable.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/mm/extable.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1,14 +1,71 @@ #include #include @@ -18480,9 +18365,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/extable.c = linux-2.6.32.38/arch/x86/mm/ext extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap =3D 1; -diff -urNp linux-2.6.32.38/arch/x86/mm/fault.c linux-2.6.32.38/arch/x86/= mm/fault.c ---- linux-2.6.32.38/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/arch/x86/mm/fault.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/arch/x86/mm/fault.c linux-2.6.32.39/arch/x86/= mm/fault.c +--- linux-2.6.32.39/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/arch/x86/mm/fault.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -11,10 +11,19 @@ #include /* __kprobes, ... */ #include /* kmmio_handler, ... */ @@ -19167,9 +19052,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/fault.c li= nux-2.6.32.38/arch/x86/mm/fault + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.32.38/arch/x86/mm/gup.c linux-2.6.32.38/arch/x86/mm= /gup.c ---- linux-2.6.32.38/arch/x86/mm/gup.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/arch/x86/mm/gup.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/arch/x86/mm/gup.c linux-2.6.32.39/arch/x86/mm= /gup.c +--- linux-2.6.32.39/arch/x86/mm/gup.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/arch/x86/mm/gup.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long=20 addr =3D start; len =3D (unsigned long) nr_pages << PAGE_SHIFT; @@ -19179,9 +19064,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/gup.c linu= x-2.6.32.38/arch/x86/mm/gup.c (void __user *)start, len))) return 0; =20 -diff -urNp linux-2.6.32.38/arch/x86/mm/highmem_32.c linux-2.6.32.38/arch= /x86/mm/highmem_32.c ---- linux-2.6.32.38/arch/x86/mm/highmem_32.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/mm/highmem_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/highmem_32.c linux-2.6.32.39/arch= /x86/mm/highmem_32.c +--- linux-2.6.32.39/arch/x86/mm/highmem_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/mm/highmem_32.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page idx =3D type + KM_TYPE_NR*smp_processor_id(); vaddr =3D __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -19193,9 +19078,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/highmem_32= .c linux-2.6.32.38/arch/x86/mm/ =20 return (void *)vaddr; } -diff -urNp linux-2.6.32.38/arch/x86/mm/hugetlbpage.c linux-2.6.32.38/arc= h/x86/mm/hugetlbpage.c ---- linux-2.6.32.38/arch/x86/mm/hugetlbpage.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/arch/x86/mm/hugetlbpage.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/hugetlbpage.c linux-2.6.32.39/arc= h/x86/mm/hugetlbpage.c +--- linux-2.6.32.39/arch/x86/mm/hugetlbpage.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/mm/hugetlbpage.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe struct hstate *h =3D hstate_file(file); struct mm_struct *mm =3D current->mm; @@ -19403,9 +19288,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/hugetlbpag= e.c linux-2.6.32.38/arch/x86/mm return addr; } if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area) -diff -urNp linux-2.6.32.38/arch/x86/mm/init_32.c linux-2.6.32.38/arch/x8= 6/mm/init_32.c ---- linux-2.6.32.38/arch/x86/mm/init_32.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/mm/init_32.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/init_32.c linux-2.6.32.39/arch/x8= 6/mm/init_32.c +--- linux-2.6.32.39/arch/x86/mm/init_32.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/mm/init_32.c 2011-04-17 15:56:46.000000000 = -0400 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } =20 @@ -19709,9 +19594,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/init_32.c = linux-2.6.32.38/arch/x86/mm/ini set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-2.6.32.38/arch/x86/mm/init_64.c linux-2.6.32.38/arch/x8= 6/mm/init_64.c ---- linux-2.6.32.38/arch/x86/mm/init_64.c 2011-04-17 17:00:52.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/mm/init_64.c 2011-04-17 17:03:05.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/init_64.c linux-2.6.32.39/arch/x8= 6/mm/init_64.c +--- linux-2.6.32.39/arch/x86/mm/init_64.c 2011-04-17 17:00:52.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/mm/init_64.c 2011-04-17 17:03:05.000000000 = -0400 @@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,=20 pmd =3D fill_pmd(pud, vaddr); pte =3D fill_pte(pmd, vaddr); @@ -19772,9 +19657,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/init_64.c = linux-2.6.32.38/arch/x86/mm/ini return "[vdso]"; if (vma =3D=3D &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.32.38/arch/x86/mm/init.c linux-2.6.32.38/arch/x86/m= m/init.c ---- linux-2.6.32.38/arch/x86/mm/init.c 2011-04-17 17:00:52.000000000 -04= 00 -+++ linux-2.6.32.38/arch/x86/mm/init.c 2011-04-17 17:03:05.000000000 -04= 00 +diff -urNp linux-2.6.32.39/arch/x86/mm/init.c linux-2.6.32.39/arch/x86/m= m/init.c +--- linux-2.6.32.39/arch/x86/mm/init.c 2011-04-17 17:00:52.000000000 -04= 00 ++++ linux-2.6.32.39/arch/x86/mm/init.c 2011-04-17 17:03:05.000000000 -04= 00 @@ -69,11 +69,7 @@ static void __init find_early_table_spac * cause a hotspot and fill up ZONE_DMA. The page tables * need roughly 0.5KB per GB. @@ -19902,9 +19787,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/init.c lin= ux-2.6.32.38/arch/x86/mm/init.c free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.32.38/arch/x86/mm/iomap_32.c linux-2.6.32.38/arch/x= 86/mm/iomap_32.c ---- linux-2.6.32.38/arch/x86/mm/iomap_32.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/mm/iomap_32.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/iomap_32.c linux-2.6.32.39/arch/x= 86/mm/iomap_32.c +--- linux-2.6.32.39/arch/x86/mm/iomap_32.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/mm/iomap_32.c 2011-04-17 15:56:46.000000000= -0400 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); idx =3D type + KM_TYPE_NR * smp_processor_id(); @@ -19917,9 +19802,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/iomap_32.c= linux-2.6.32.38/arch/x86/mm/io arch_flush_lazy_mmu_mode(); =20 return (void *)vaddr; -diff -urNp linux-2.6.32.38/arch/x86/mm/ioremap.c linux-2.6.32.38/arch/x8= 6/mm/ioremap.c ---- linux-2.6.32.38/arch/x86/mm/ioremap.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/mm/ioremap.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/ioremap.c linux-2.6.32.39/arch/x8= 6/mm/ioremap.c +--- linux-2.6.32.39/arch/x86/mm/ioremap.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/mm/ioremap.c 2011-04-17 15:56:46.000000000 = -0400 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) * Second special case: Some BIOSen report the PC BIOS * area (640->1Mb) as ram even though it is not. @@ -19966,9 +19851,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/ioremap.c = linux-2.6.32.38/arch/x86/mm/ior =20 /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.32.38/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.3= 2.38/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.32.38/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.3= 2.39/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg * memory (e.g. tracked pages)? For now, we need this to avoid * invoking kmemcheck for PnP BIOS calls. @@ -19981,9 +19866,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/kmemcheck/= kmemcheck.c linux-2.6.32.38/arc return false; =20 pte =3D kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.32.38/arch/x86/mm/mmap.c linux-2.6.32.38/arch/x86/m= m/mmap.c ---- linux-2.6.32.38/arch/x86/mm/mmap.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/arch/x86/mm/mmap.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/arch/x86/mm/mmap.c linux-2.6.32.39/arch/x86/m= m/mmap.c +--- linux-2.6.32.39/arch/x86/mm/mmap.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/arch/x86/mm/mmap.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -20065,9 +19950,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/mmap.c lin= ux-2.6.32.38/arch/x86/mm/mmap.c mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.38/arch/x86/mm/numa_32.c linux-2.6.32.38/arch/x8= 6/mm/numa_32.c ---- linux-2.6.32.38/arch/x86/mm/numa_32.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/mm/numa_32.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/numa_32.c linux-2.6.32.39/arch/x8= 6/mm/numa_32.c +--- linux-2.6.32.39/arch/x86/mm/numa_32.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/mm/numa_32.c 2011-04-17 15:56:46.000000000 = -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -20076,9 +19961,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/numa_32.c = linux-2.6.32.38/arch/x86/mm/num extern unsigned long highend_pfn, highstart_pfn; =20 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.32.38/arch/x86/mm/pageattr.c linux-2.6.32.38/arch/x= 86/mm/pageattr.c ---- linux-2.6.32.38/arch/x86/mm/pageattr.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/mm/pageattr.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/pageattr.c linux-2.6.32.39/arch/x= 86/mm/pageattr.c +--- linux-2.6.32.39/arch/x86/mm/pageattr.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/mm/pageattr.c 2011-04-17 15:56:46.000000000= -0400 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. */ @@ -20155,9 +20040,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pageattr.c= linux-2.6.32.38/arch/x86/mm/pa } =20 static int -diff -urNp linux-2.6.32.38/arch/x86/mm/pageattr-test.c linux-2.6.32.38/a= rch/x86/mm/pageattr-test.c ---- linux-2.6.32.38/arch/x86/mm/pageattr-test.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/arch/x86/mm/pageattr-test.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/pageattr-test.c linux-2.6.32.39/a= rch/x86/mm/pageattr-test.c +--- linux-2.6.32.39/arch/x86/mm/pageattr-test.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/arch/x86/mm/pageattr-test.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -36,7 +36,7 @@ enum { =20 static int pte_testbit(pte_t pte) @@ -20167,9 +20052,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pageattr-t= est.c linux-2.6.32.38/arch/x86/ } =20 struct split_state { -diff -urNp linux-2.6.32.38/arch/x86/mm/pat.c linux-2.6.32.38/arch/x86/mm= /pat.c ---- linux-2.6.32.38/arch/x86/mm/pat.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/arch/x86/mm/pat.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/arch/x86/mm/pat.c linux-2.6.32.39/arch/x86/mm= /pat.c +--- linux-2.6.32.39/arch/x86/mm/pat.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/arch/x86/mm/pat.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct =20 conflict: @@ -20217,9 +20102,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pat.c linu= x-2.6.32.38/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.32.38/arch/x86/mm/pgtable_32.c linux-2.6.32.38/arch= /x86/mm/pgtable_32.c ---- linux-2.6.32.38/arch/x86/mm/pgtable_32.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/mm/pgtable_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable_32.c linux-2.6.32.39/arch= /x86/mm/pgtable_32.c +--- linux-2.6.32.39/arch/x86/mm/pgtable_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/mm/pgtable_32.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,=20 return; } @@ -20234,9 +20119,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pgtable_32= .c linux-2.6.32.38/arch/x86/mm/ =20 /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.32.38/arch/x86/mm/pgtable.c linux-2.6.32.38/arch/x8= 6/mm/pgtable.c ---- linux-2.6.32.38/arch/x86/mm/pgtable.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/mm/pgtable.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x8= 6/mm/pgtable.c +--- linux-2.6.32.39/arch/x86/mm/pgtable.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/mm/pgtable.c 2011-04-17 15:56:46.000000000 = -0400 @@ -83,8 +83,58 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -20489,9 +20374,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pgtable.c = linux-2.6.32.38/arch/x86/mm/pgt pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.32.38/arch/x86/mm/setup_nx.c linux-2.6.32.38/arch/x= 86/mm/setup_nx.c ---- linux-2.6.32.38/arch/x86/mm/setup_nx.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/mm/setup_nx.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/mm/setup_nx.c linux-2.6.32.39/arch/x= 86/mm/setup_nx.c +--- linux-2.6.32.39/arch/x86/mm/setup_nx.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/mm/setup_nx.c 2011-04-17 15:56:46.000000000= -0400 @@ -4,11 +4,10 @@ =20 #include @@ -20557,18 +20442,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/setup_nx.= c linux-2.6.32.38/arch/x86/mm/se __supported_pte_mask &=3D ~_PAGE_NX; } #endif -diff -urNp linux-2.6.32.38/arch/x86/mm/tlb.c linux-2.6.32.38/arch/x86/mm= /tlb.c ---- linux-2.6.32.38/arch/x86/mm/tlb.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/arch/x86/mm/tlb.c 2011-04-17 15:56:46.000000000 -040= 0 -@@ -12,7 +12,7 @@ - #include -=20 - DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) -- =3D { &init_mm, 0, }; -+ =3D { &init_mm, 0 }; -=20 - /* - * Smarter SMP flushing macros. +diff -urNp linux-2.6.32.39/arch/x86/mm/tlb.c linux-2.6.32.39/arch/x86/mm= /tlb.c +--- linux-2.6.32.39/arch/x86/mm/tlb.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/arch/x86/mm/tlb.c 2011-04-23 12:56:10.000000000 -040= 0 @@ -61,7 +61,11 @@ void leave_mm(int cpu) BUG(); cpumask_clear_cpu(cpu, @@ -20581,9 +20457,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/tlb.c linu= x-2.6.32.38/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); =20 -diff -urNp linux-2.6.32.38/arch/x86/oprofile/backtrace.c linux-2.6.32.38= /arch/x86/oprofile/backtrace.c ---- linux-2.6.32.38/arch/x86/oprofile/backtrace.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/arch/x86/oprofile/backtrace.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/oprofile/backtrace.c linux-2.6.32.39= /arch/x86/oprofile/backtrace.c +--- linux-2.6.32.39/arch/x86/oprofile/backtrace.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/arch/x86/oprofile/backtrace.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back struct frame_head bufhead[2]; =20 @@ -20602,9 +20478,9 @@ diff -urNp linux-2.6.32.38/arch/x86/oprofile/back= trace.c linux-2.6.32.38/arch/x8 unsigned long stack =3D kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-2.6.32.38/arch/x86/oprofile/op_model_p4.c linux-2.6.32.= 38/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.32.38/arch/x86/oprofile/op_model_p4.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c linux-2.6.32.= 39/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -20614,9 +20490,9 @@ diff -urNp linux-2.6.32.38/arch/x86/oprofile/op_m= odel_p4.c linux-2.6.32.38/arch/ { #ifdef CONFIG_SMP return smp_num_siblings =3D=3D 2 ? 2 : 1; -diff -urNp linux-2.6.32.38/arch/x86/pci/common.c linux-2.6.32.38/arch/x8= 6/pci/common.c ---- linux-2.6.32.38/arch/x86/pci/common.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/pci/common.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/pci/common.c linux-2.6.32.39/arch/x8= 6/pci/common.c +--- linux-2.6.32.39/arch/x86/pci/common.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/pci/common.c 2011-04-23 12:56:10.000000000 = -0400 @@ -31,8 +31,8 @@ int noioapicreroute =3D 1; int pcibios_last_bus =3D -1; unsigned long pirq_table_addr; @@ -20628,18 +20504,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/common.c= linux-2.6.32.38/arch/x86/pci/co =20 int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int de= vfn, int reg, int len, u32 *val) -@@ -370,7 +370,7 @@ static const struct dmi_system_id __devi - DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), - }, - }, -- {} -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} - }; -=20 - void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.32.38/arch/x86/pci/direct.c linux-2.6.32.38/arch/x8= 6/pci/direct.c ---- linux-2.6.32.38/arch/x86/pci/direct.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/pci/direct.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/pci/direct.c linux-2.6.32.39/arch/x8= 6/pci/direct.c +--- linux-2.6.32.39/arch/x86/pci/direct.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/pci/direct.c 2011-04-17 15:56:46.000000000 = -0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int=20 =20 #undef PCI_CONF1_ADDRESS @@ -20667,51 +20534,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/direct.c= linux-2.6.32.38/arch/x86/pci/di { u32 x =3D 0; int year, devfn; -diff -urNp linux-2.6.32.38/arch/x86/pci/fixup.c linux-2.6.32.38/arch/x86= /pci/fixup.c ---- linux-2.6.32.38/arch/x86/pci/fixup.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/arch/x86/pci/fixup.c 2011-04-17 15:56:46.000000000 -= 0400 -@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi - DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), - }, - }, -- {} -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - /* -@@ -435,7 +435,7 @@ static const struct dmi_system_id __devi - DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *de= v) -diff -urNp linux-2.6.32.38/arch/x86/pci/irq.c linux-2.6.32.38/arch/x86/p= ci/irq.c ---- linux-2.6.32.38/arch/x86/pci/irq.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/arch/x86/pci/irq.c 2011-04-17 15:56:46.000000000 -04= 00 -@@ -543,7 +543,7 @@ static __init int intel_router_probe(str - static struct pci_device_id __initdata pirq_440gx[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2) }, -- { }, -+ { PCI_DEVICE(0, 0) } - }; -=20 - /* 440GX has a proprietary PIRQ router -- don't use it */ -@@ -1109,7 +1109,7 @@ static struct dmi_system_id __initdata p - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - int __init pcibios_irq_init(void) -diff -urNp linux-2.6.32.38/arch/x86/pci/mmconfig_32.c linux-2.6.32.38/ar= ch/x86/pci/mmconfig_32.c ---- linux-2.6.32.38/arch/x86/pci/mmconfig_32.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/pci/mmconfig_32.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/pci/mmconfig_32.c linux-2.6.32.39/ar= ch/x86/pci/mmconfig_32.c +--- linux-2.6.32.39/arch/x86/pci/mmconfig_32.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/pci/mmconfig_32.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int=20 return 0; } @@ -20721,9 +20546,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/mmconfig_= 32.c linux-2.6.32.38/arch/x86/p .read =3D pci_mmcfg_read, .write =3D pci_mmcfg_write, }; -diff -urNp linux-2.6.32.38/arch/x86/pci/mmconfig_64.c linux-2.6.32.38/ar= ch/x86/pci/mmconfig_64.c ---- linux-2.6.32.38/arch/x86/pci/mmconfig_64.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/arch/x86/pci/mmconfig_64.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/pci/mmconfig_64.c linux-2.6.32.39/ar= ch/x86/pci/mmconfig_64.c +--- linux-2.6.32.39/arch/x86/pci/mmconfig_64.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/arch/x86/pci/mmconfig_64.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int=20 return 0; } @@ -20733,9 +20558,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/mmconfig_= 64.c linux-2.6.32.38/arch/x86/p .read =3D pci_mmcfg_read, .write =3D pci_mmcfg_write, }; -diff -urNp linux-2.6.32.38/arch/x86/pci/numaq_32.c linux-2.6.32.38/arch/= x86/pci/numaq_32.c ---- linux-2.6.32.38/arch/x86/pci/numaq_32.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/x86/pci/numaq_32.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/x86/pci/numaq_32.c linux-2.6.32.39/arch/= x86/pci/numaq_32.c +--- linux-2.6.32.39/arch/x86/pci/numaq_32.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/x86/pci/numaq_32.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i =20 #undef PCI_CONF1_MQ_ADDRESS @@ -20745,9 +20570,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/numaq_32.= c linux-2.6.32.38/arch/x86/pci/ .read =3D pci_conf1_mq_read, .write =3D pci_conf1_mq_write }; -diff -urNp linux-2.6.32.38/arch/x86/pci/olpc.c linux-2.6.32.38/arch/x86/= pci/olpc.c ---- linux-2.6.32.38/arch/x86/pci/olpc.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/arch/x86/pci/olpc.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/arch/x86/pci/olpc.c linux-2.6.32.39/arch/x86/= pci/olpc.c +--- linux-2.6.32.39/arch/x86/pci/olpc.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/arch/x86/pci/olpc.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -20757,9 +20582,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/olpc.c li= nux-2.6.32.38/arch/x86/pci/olpc .read =3D pci_olpc_read, .write =3D pci_olpc_write, }; -diff -urNp linux-2.6.32.38/arch/x86/pci/pcbios.c linux-2.6.32.38/arch/x8= 6/pci/pcbios.c ---- linux-2.6.32.38/arch/x86/pci/pcbios.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/arch/x86/pci/pcbios.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/arch/x86/pci/pcbios.c linux-2.6.32.39/arch/x8= 6/pci/pcbios.c +--- linux-2.6.32.39/arch/x86/pci/pcbios.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/arch/x86/pci/pcbios.c 2011-04-17 15:56:46.000000000 = -0400 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -21082,9 +20907,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/pcbios.c = linux-2.6.32.38/arch/x86/pci/pc return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.32.38/arch/x86/power/cpu.c linux-2.6.32.38/arch/x86= /power/cpu.c ---- linux-2.6.32.38/arch/x86/power/cpu.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/arch/x86/power/cpu.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/arch/x86/power/cpu.c linux-2.6.32.39/arch/x86= /power/cpu.c +--- linux-2.6.32.39/arch/x86/power/cpu.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/arch/x86/power/cpu.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -129,7 +129,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -21104,9 +20929,9 @@ diff -urNp linux-2.6.32.38/arch/x86/power/cpu.c l= inux-2.6.32.38/arch/x86/power/c =20 syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.32.38/arch/x86/vdso/Makefile linux-2.6.32.38/arch/x= 86/vdso/Makefile ---- linux-2.6.32.38/arch/x86/vdso/Makefile 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/vdso/Makefile 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/vdso/Makefile linux-2.6.32.39/arch/x= 86/vdso/Makefile +--- linux-2.6.32.39/arch/x86/vdso/Makefile 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/vdso/Makefile 2011-04-17 15:56:46.000000000= -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso =3D VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -21116,9 +20941,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/Makefile= linux-2.6.32.38/arch/x86/vdso/ GCOV_PROFILE :=3D n =20 # -diff -urNp linux-2.6.32.38/arch/x86/vdso/vclock_gettime.c linux-2.6.32.3= 8/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.32.38/arch/x86/vdso/vclock_gettime.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c linux-2.6.32.3= 9/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -22,24 +22,48 @@ #include #include @@ -21217,9 +21042,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vclock_g= ettime.c linux-2.6.32.38/arch/x } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c linux-2.6.32.38/= arch/x86/vdso/vdso32-setup.c ---- linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c linux-2.6.32.39/= arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c 2011-04-23 12:56:10.000= 000000 -0400 @@ -25,6 +25,7 @@ #include #include @@ -21277,24 +21102,6 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso32-= setup.c linux-2.6.32.38/arch/x86 =20 up_write(&mm->mmap_sem); =20 -@@ -388,7 +389,7 @@ static ctl_table abi_table2[] =3D { - .mode =3D 0644, - .proc_handler =3D proc_dointvec - }, -- {} -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static ctl_table abi_root_table2[] =3D { -@@ -398,7 +399,7 @@ static ctl_table abi_root_table2[] =3D { - .mode =3D 0555, - .child =3D abi_table2 - }, -- {} -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static __init int ia32_binfmt_init(void) @@ -413,8 +414,14 @@ __initcall(ia32_binfmt_init); =20 const char *arch_vma_name(struct vm_area_struct *vma) @@ -21320,9 +21127,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso32-s= etup.c linux-2.6.32.38/arch/x86 return &gate_vma; return NULL; } -diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso.lds.S linux-2.6.32.38/arch= /x86/vdso/vdso.lds.S ---- linux-2.6.32.38/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/vdso/vdso.lds.S 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/vdso/vdso.lds.S linux-2.6.32.39/arch= /x86/vdso/vdso.lds.S +--- linux-2.6.32.39/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/vdso/vdso.lds.S 2011-04-17 15:56:46.0000000= 00 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK =3D VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x =3D vdso_ ## x; #include "vextern.h" @@ -21333,9 +21140,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso.lds= .S linux-2.6.32.38/arch/x86/vds +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.32.38/arch/x86/vdso/vextern.h linux-2.6.32.38/arch/= x86/vdso/vextern.h ---- linux-2.6.32.38/arch/x86/vdso/vextern.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/x86/vdso/vextern.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/x86/vdso/vextern.h linux-2.6.32.39/arch/= x86/vdso/vextern.h +--- linux-2.6.32.39/arch/x86/vdso/vextern.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/x86/vdso/vextern.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. The main kernel later fills in the values. */ @@ -21343,9 +21150,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vextern.= h linux-2.6.32.38/arch/x86/vdso -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.32.38/arch/x86/vdso/vma.c linux-2.6.32.38/arch/x86/= vdso/vma.c ---- linux-2.6.32.38/arch/x86/vdso/vma.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/arch/x86/vdso/vma.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/arch/x86/vdso/vma.c linux-2.6.32.39/arch/x86/= vdso/vma.c +--- linux-2.6.32.39/arch/x86/vdso/vma.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/arch/x86/vdso/vma.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -21392,9 +21199,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vma.c li= nux-2.6.32.38/arch/x86/vdso/vma - return 0; -} -__setup("vdso=3D", vdso_setup); -diff -urNp linux-2.6.32.38/arch/x86/xen/enlighten.c linux-2.6.32.38/arch= /x86/xen/enlighten.c ---- linux-2.6.32.38/arch/x86/xen/enlighten.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/arch/x86/xen/enlighten.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/arch/x86/xen/enlighten.c linux-2.6.32.39/arch= /x86/xen/enlighten.c +--- linux-2.6.32.39/arch/x86/xen/enlighten.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/arch/x86/xen/enlighten.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); =20 struct shared_info xen_dummy_shared_info; @@ -21450,9 +21257,9 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/enlighten= .c linux-2.6.32.38/arch/x86/xen xen_smp_init(); =20 pgd =3D (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.32.38/arch/x86/xen/mmu.c linux-2.6.32.38/arch/x86/x= en/mmu.c ---- linux-2.6.32.38/arch/x86/xen/mmu.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/arch/x86/xen/mmu.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/arch/x86/xen/mmu.c linux-2.6.32.39/arch/x86/x= en/mmu.c +--- linux-2.6.32.39/arch/x86/xen/mmu.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/arch/x86/xen/mmu.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -1714,6 +1714,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -21473,9 +21280,9 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/mmu.c lin= ux-2.6.32.38/arch/x86/xen/mmu.c set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); =20 -diff -urNp linux-2.6.32.38/arch/x86/xen/smp.c linux-2.6.32.38/arch/x86/x= en/smp.c ---- linux-2.6.32.38/arch/x86/xen/smp.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/arch/x86/xen/smp.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/arch/x86/xen/smp.c linux-2.6.32.39/arch/x86/x= en/smp.c +--- linux-2.6.32.39/arch/x86/xen/smp.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/arch/x86/xen/smp.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() !=3D 0); @@ -21520,9 +21327,33 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/smp.c li= nux-2.6.32.38/arch/x86/xen/smp.c #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -diff -urNp linux-2.6.32.38/arch/x86/xen/xen-head.S linux-2.6.32.38/arch/= x86/xen/xen-head.S ---- linux-2.6.32.38/arch/x86/xen/xen-head.S 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/arch/x86/xen/xen-head.S 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/arch/x86/xen/xen-asm_32.S linux-2.6.32.39/arc= h/x86/xen/xen-asm_32.S +--- linux-2.6.32.39/arch/x86/xen/xen-asm_32.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/arch/x86/xen/xen-asm_32.S 2011-04-22 19:13:13.000000= 000 -0400 +@@ -83,14 +83,14 @@ ENTRY(xen_iret) + ESP_OFFSET=3D4 # bytes pushed onto stack +=20 + /* +- * Store vcpu_info pointer for easy access. Do it this way to +- * avoid having to reload %fs ++ * Store vcpu_info pointer for easy access. + */ + #ifdef CONFIG_SMP +- GET_THREAD_INFO(%eax) +- movl TI_cpu(%eax), %eax +- movl __per_cpu_offset(,%eax,4), %eax +- mov per_cpu__xen_vcpu(%eax), %eax ++ push %fs ++ mov $(__KERNEL_PERCPU), %eax ++ mov %eax, %fs ++ mov PER_CPU_VAR(xen_vcpu), %eax ++ pop %fs + #else + movl per_cpu__xen_vcpu, %eax + #endif +diff -urNp linux-2.6.32.39/arch/x86/xen/xen-head.S linux-2.6.32.39/arch/= x86/xen/xen-head.S +--- linux-2.6.32.39/arch/x86/xen/xen-head.S 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/arch/x86/xen/xen-head.S 2011-04-17 15:56:46.00000000= 0 -0400 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -21541,9 +21372,9 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/xen-head.= S linux-2.6.32.38/arch/x86/xen/ #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-2.6.32.38/arch/x86/xen/xen-ops.h linux-2.6.32.38/arch/x= 86/xen/xen-ops.h ---- linux-2.6.32.38/arch/x86/xen/xen-ops.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/arch/x86/xen/xen-ops.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/arch/x86/xen/xen-ops.h linux-2.6.32.39/arch/x= 86/xen/xen-ops.h +--- linux-2.6.32.39/arch/x86/xen/xen-ops.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/arch/x86/xen/xen-ops.h 2011-04-17 15:56:46.000000000= -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -21553,9 +21384,9 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/xen-ops.h= linux-2.6.32.38/arch/x86/xen/x struct trap_info; void xen_copy_trap_info(struct trap_info *traps); =20 -diff -urNp linux-2.6.32.38/block/blk-integrity.c linux-2.6.32.38/block/b= lk-integrity.c ---- linux-2.6.32.38/block/blk-integrity.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/block/blk-integrity.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/block/blk-integrity.c linux-2.6.32.39/block/b= lk-integrity.c +--- linux-2.6.32.39/block/blk-integrity.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/block/blk-integrity.c 2011-04-17 15:56:46.000000000 = -0400 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -21565,9 +21396,9 @@ diff -urNp linux-2.6.32.38/block/blk-integrity.c = linux-2.6.32.38/block/blk-integ .show =3D &integrity_attr_show, .store =3D &integrity_attr_store, }; -diff -urNp linux-2.6.32.38/block/blk-iopoll.c linux-2.6.32.38/block/blk-= iopoll.c ---- linux-2.6.32.38/block/blk-iopoll.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/block/blk-iopoll.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/block/blk-iopoll.c linux-2.6.32.39/block/blk-= iopoll.c +--- linux-2.6.32.39/block/blk-iopoll.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/block/blk-iopoll.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -21577,9 +21408,9 @@ diff -urNp linux-2.6.32.38/block/blk-iopoll.c lin= ux-2.6.32.38/block/blk-iopoll.c { struct list_head *list =3D &__get_cpu_var(blk_cpu_iopoll); int rearm =3D 0, budget =3D blk_iopoll_budget; -diff -urNp linux-2.6.32.38/block/blk-map.c linux-2.6.32.38/block/blk-map= .c ---- linux-2.6.32.38/block/blk-map.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/block/blk-map.c 2011-04-18 16:57:33.000000000 -0400 +diff -urNp linux-2.6.32.39/block/blk-map.c linux-2.6.32.39/block/blk-map= .c +--- linux-2.6.32.39/block/blk-map.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/block/blk-map.c 2011-04-18 16:57:33.000000000 -0400 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -21614,9 +21445,9 @@ diff -urNp linux-2.6.32.38/block/blk-map.c linux-= 2.6.32.38/block/blk-map.c if (do_copy) bio =3D bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.32.38/block/blk-softirq.c linux-2.6.32.38/block/blk= -softirq.c ---- linux-2.6.32.38/block/blk-softirq.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/block/blk-softirq.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/block/blk-softirq.c linux-2.6.32.39/block/blk= -softirq.c +--- linux-2.6.32.39/block/blk-softirq.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/block/blk-softirq.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,=20 * Softirq action handler - move entries to local list and loop over th= em * while passing them to the queue registered handler. @@ -21626,9 +21457,9 @@ diff -urNp linux-2.6.32.38/block/blk-softirq.c li= nux-2.6.32.38/block/blk-softirq { struct list_head *cpu_list, local_list; =20 -diff -urNp linux-2.6.32.38/block/blk-sysfs.c linux-2.6.32.38/block/blk-s= ysfs.c ---- linux-2.6.32.38/block/blk-sysfs.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/block/blk-sysfs.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/block/blk-sysfs.c linux-2.6.32.39/block/blk-s= ysfs.c +--- linux-2.6.32.39/block/blk-sysfs.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/block/blk-sysfs.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -21638,9 +21469,9 @@ diff -urNp linux-2.6.32.38/block/blk-sysfs.c linu= x-2.6.32.38/block/blk-sysfs.c .show =3D queue_attr_show, .store =3D queue_attr_store, }; -diff -urNp linux-2.6.32.38/block/bsg.c linux-2.6.32.38/block/bsg.c ---- linux-2.6.32.38/block/bsg.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/block/bsg.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/block/bsg.c linux-2.6.32.39/block/bsg.c +--- linux-2.6.32.39/block/bsg.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/block/bsg.c 2011-04-17 15:56:46.000000000 -0400 @@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct r struct sg_io_v4 *hdr, struct bsg_device *bd, fmode_t has_write_perm) @@ -21668,9 +21499,9 @@ diff -urNp linux-2.6.32.38/block/bsg.c linux-2.6.= 32.38/block/bsg.c if (hdr->subprotocol =3D=3D BSG_SUB_PROTOCOL_SCSI_CMD) { if (blk_verify_command(rq->cmd, has_write_perm)) return -EPERM; -diff -urNp linux-2.6.32.38/block/elevator.c linux-2.6.32.38/block/elevat= or.c ---- linux-2.6.32.38/block/elevator.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/block/elevator.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/block/elevator.c linux-2.6.32.39/block/elevat= or.c +--- linux-2.6.32.39/block/elevator.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/block/elevator.c 2011-04-17 15:56:46.000000000 -0400 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -21680,10 +21511,10 @@ diff -urNp linux-2.6.32.38/block/elevator.c lin= ux-2.6.32.38/block/elevator.c .show =3D elv_attr_show, .store =3D elv_attr_store, }; -diff -urNp linux-2.6.32.38/block/scsi_ioctl.c linux-2.6.32.38/block/scsi= _ioctl.c ---- linux-2.6.32.38/block/scsi_ioctl.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/block/scsi_ioctl.c 2011-04-17 15:56:46.000000000 -04= 00 -@@ -220,8 +220,21 @@ EXPORT_SYMBOL(blk_verify_command); +diff -urNp linux-2.6.32.39/block/scsi_ioctl.c linux-2.6.32.39/block/scsi= _ioctl.c +--- linux-2.6.32.39/block/scsi_ioctl.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/block/scsi_ioctl.c 2011-04-23 13:28:22.000000000 -04= 00 +@@ -220,8 +220,20 @@ EXPORT_SYMBOL(blk_verify_command); static int blk_fill_sghdr_rq(struct request_queue *q, struct request *r= q, struct sg_io_hdr *hdr, fmode_t mode) { @@ -21702,21 +21533,19 @@ diff -urNp linux-2.6.32.38/block/scsi_ioctl.c l= inux-2.6.32.38/block/scsi_ioctl.c + if (cmdptr !=3D rq->cmd) + memcpy(rq->cmd, cmdptr, hdr->cmd_len); + -+ if (blk_verify_command(rq->cmd, mode & FMODE_WRITE)) return -EPERM; =20 -@@ -430,6 +443,9 @@ int sg_scsi_ioctl(struct request_queue * +@@ -430,6 +442,8 @@ int sg_scsi_ioctl(struct request_queue * int err; unsigned int in_len, out_len, bytes, opcode, cmdlen; char *buffer =3D NULL, sense[SCSI_SENSE_BUFFERSIZE]; + unsigned char tmpcmd[sizeof(rq->__cmd)]; + unsigned char *cmdptr; -+ =20 if (!sic) return -EINVAL; -@@ -463,9 +479,18 @@ int sg_scsi_ioctl(struct request_queue * +@@ -463,9 +477,18 @@ int sg_scsi_ioctl(struct request_queue * */ err =3D -EFAULT; rq->cmd_len =3D cmdlen; @@ -21736,21 +21565,9 @@ diff -urNp linux-2.6.32.38/block/scsi_ioctl.c li= nux-2.6.32.38/block/scsi_ioctl.c if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; =20 -diff -urNp linux-2.6.32.38/crypto/lrw.c linux-2.6.32.38/crypto/lrw.c ---- linux-2.6.32.38/crypto/lrw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/crypto/lrw.c 2011-04-17 15:56:46.000000000 -0400 -@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par - struct priv *ctx =3D crypto_tfm_ctx(parent); - struct crypto_cipher *child =3D ctx->child; - int err, i; -- be128 tmp =3D { 0 }; -+ be128 tmp =3D { 0, 0 }; - int bsize =3D crypto_cipher_blocksize(child); -=20 - crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.32.38/Documentation/dontdiff linux-2.6.32.38/Docume= ntation/dontdiff ---- linux-2.6.32.38/Documentation/dontdiff 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/Documentation/dontdiff 2011-04-17 15:56:45.000000000= -0400 +diff -urNp linux-2.6.32.39/Documentation/dontdiff linux-2.6.32.39/Docume= ntation/dontdiff +--- linux-2.6.32.39/Documentation/dontdiff 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/Documentation/dontdiff 2011-04-17 15:56:45.000000000= -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -21868,9 +21685,9 @@ diff -urNp linux-2.6.32.38/Documentation/dontdiff= linux-2.6.32.38/Documentation/ zImage* zconf.hash.c +zoffset.h -diff -urNp linux-2.6.32.38/Documentation/kernel-parameters.txt linux-2.6= .32.38/Documentation/kernel-parameters.txt ---- linux-2.6.32.38/Documentation/kernel-parameters.txt 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/Documentation/kernel-parameters.txt 2011-04-17 15:56= :45.000000000 -0400 +diff -urNp linux-2.6.32.39/Documentation/kernel-parameters.txt linux-2.6= .32.39/Documentation/kernel-parameters.txt +--- linux-2.6.32.39/Documentation/kernel-parameters.txt 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/Documentation/kernel-parameters.txt 2011-04-17 15:56= :45.000000000 -0400 @@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters.=20 the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -21885,9 +21702,9 @@ diff -urNp linux-2.6.32.38/Documentation/kernel-p= arameters.txt linux-2.6.32.38/D pcbit=3D [HW,ISDN] =20 pcd. [PARIDE] -diff -urNp linux-2.6.32.38/drivers/acpi/acpi_pad.c linux-2.6.32.38/drive= rs/acpi/acpi_pad.c ---- linux-2.6.32.38/drivers/acpi/acpi_pad.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/acpi/acpi_pad.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/acpi/acpi_pad.c linux-2.6.32.39/drive= rs/acpi/acpi_pad.c +--- linux-2.6.32.39/drivers/acpi/acpi_pad.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/acpi/acpi_pad.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -30,7 +30,7 @@ #include #include @@ -21897,9 +21714,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/acpi_pad.= c linux-2.6.32.38/drivers/acpi/ #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 static DEFINE_MUTEX(isolated_cpus_lock); -diff -urNp linux-2.6.32.38/drivers/acpi/battery.c linux-2.6.32.38/driver= s/acpi/battery.c ---- linux-2.6.32.38/drivers/acpi/battery.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/acpi/battery.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/acpi/battery.c linux-2.6.32.39/driver= s/acpi/battery.c +--- linux-2.6.32.39/drivers/acpi/battery.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/acpi/battery.c 2011-04-17 15:56:46.000000000= -0400 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } =20 @@ -21909,21 +21726,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/battery.= c linux-2.6.32.38/drivers/acpi/b mode_t mode; const char *name; } acpi_battery_file[] =3D { -diff -urNp linux-2.6.32.38/drivers/acpi/blacklist.c linux-2.6.32.38/driv= ers/acpi/blacklist.c ---- linux-2.6.32.38/drivers/acpi/blacklist.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/acpi/blacklist.c 2011-04-17 15:56:46.0000000= 00 -0400 -@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b - {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, - "Incorrect _ADR", 1}, -=20 -- {""} -+ {"", "", 0, NULL, all_versions, NULL, 0} - }; -=20 - #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.32.38/drivers/acpi/dock.c linux-2.6.32.38/drivers/a= cpi/dock.c ---- linux-2.6.32.38/drivers/acpi/dock.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/drivers/acpi/dock.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/drivers/acpi/dock.c linux-2.6.32.39/drivers/a= cpi/dock.c +--- linux-2.6.32.39/drivers/acpi/dock.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/drivers/acpi/dock.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -21942,9 +21747,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/dock.c li= nux-2.6.32.38/drivers/acpi/dock void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.32.38/drivers/acpi/osl.c linux-2.6.32.38/drivers/ac= pi/osl.c ---- linux-2.6.32.38/drivers/acpi/osl.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/acpi/osl.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/acpi/osl.c linux-2.6.32.39/drivers/ac= pi/osl.c +--- linux-2.6.32.39/drivers/acpi/osl.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/acpi/osl.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; =20 @@ -21963,9 +21768,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/osl.c lin= ux-2.6.32.38/drivers/acpi/osl.c =20 switch (width) { case 8: -diff -urNp linux-2.6.32.38/drivers/acpi/power_meter.c linux-2.6.32.38/dr= ivers/acpi/power_meter.c ---- linux-2.6.32.38/drivers/acpi/power_meter.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/acpi/power_meter.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/acpi/power_meter.c linux-2.6.32.39/dr= ivers/acpi/power_meter.c +--- linux-2.6.32.39/drivers/acpi/power_meter.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/acpi/power_meter.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d return res; =20 @@ -21975,9 +21780,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/power_met= er.c linux-2.6.32.38/drivers/ac =20 mutex_lock(&resource->lock); resource->trip[attr->index - 7] =3D temp; -diff -urNp linux-2.6.32.38/drivers/acpi/proc.c linux-2.6.32.38/drivers/a= cpi/proc.c ---- linux-2.6.32.38/drivers/acpi/proc.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/drivers/acpi/proc.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/drivers/acpi/proc.c linux-2.6.32.39/drivers/a= cpi/proc.c +--- linux-2.6.32.39/drivers/acpi/proc.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/drivers/acpi/proc.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -22013,9 +21818,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/proc.c li= nux-2.6.32.38/drivers/acpi/proc dev->wakeup.state.enabled =3D dev->wakeup.state.enabled ? 0 : 1; found_dev =3D dev; -diff -urNp linux-2.6.32.38/drivers/acpi/processor_core.c linux-2.6.32.38= /drivers/acpi/processor_core.c ---- linux-2.6.32.38/drivers/acpi/processor_core.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/acpi/processor_core.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/acpi/processor_core.c linux-2.6.32.39= /drivers/acpi/processor_core.c +--- linux-2.6.32.39/drivers/acpi/processor_core.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/acpi/processor_core.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -22025,21 +21830,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/processo= r_core.c linux-2.6.32.38/drivers =20 /* * Buggy BIOS check -diff -urNp linux-2.6.32.38/drivers/acpi/processor_idle.c linux-2.6.32.38= /drivers/acpi/processor_idle.c ---- linux-2.6.32.38/drivers/acpi/processor_idle.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/acpi/processor_idle.c 2011-04-17 15:56:46.00= 0000000 -0400 -@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), - DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, - (void *)1}, -- {}, -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL}, - }; -=20 -=20 -diff -urNp linux-2.6.32.38/drivers/acpi/sbshc.c linux-2.6.32.38/drivers/= acpi/sbshc.c ---- linux-2.6.32.38/drivers/acpi/sbshc.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/acpi/sbshc.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/acpi/sbshc.c linux-2.6.32.39/drivers/= acpi/sbshc.c +--- linux-2.6.32.39/drivers/acpi/sbshc.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/acpi/sbshc.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -17,7 +17,7 @@ =20 #define PREFIX "ACPI: " @@ -22049,9 +21842,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/sbshc.c l= inux-2.6.32.38/drivers/acpi/sbs #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" =20 struct acpi_smb_hc { -diff -urNp linux-2.6.32.38/drivers/acpi/sleep.c linux-2.6.32.38/drivers/= acpi/sleep.c ---- linux-2.6.32.38/drivers/acpi/sleep.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/acpi/sleep.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/acpi/sleep.c linux-2.6.32.39/drivers/= acpi/sleep.c +--- linux-2.6.32.39/drivers/acpi/sleep.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/acpi/sleep.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp } } @@ -22088,9 +21881,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/sleep.c l= inux-2.6.32.38/drivers/acpi/sle .begin =3D acpi_hibernation_begin_old, .end =3D acpi_pm_end, .pre_snapshot =3D acpi_hibernation_pre_snapshot_old, -diff -urNp linux-2.6.32.38/drivers/acpi/video.c linux-2.6.32.38/drivers/= acpi/video.c ---- linux-2.6.32.38/drivers/acpi/video.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/acpi/video.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/acpi/video.c linux-2.6.32.39/drivers/= acpi/video.c +--- linux-2.6.32.39/drivers/acpi/video.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/acpi/video.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -22100,9 +21893,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/video.c l= inux-2.6.32.38/drivers/acpi/vid .get_brightness =3D acpi_video_get_brightness, .update_status =3D acpi_video_set_brightness, }; -diff -urNp linux-2.6.32.38/drivers/ata/ahci.c linux-2.6.32.38/drivers/at= a/ahci.c ---- linux-2.6.32.38/drivers/ata/ahci.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/ata/ahci.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/ata/ahci.c linux-2.6.32.39/drivers/at= a/ahci.c +--- linux-2.6.32.39/drivers/ata/ahci.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/ata/ahci.c 2011-04-23 12:56:10.000000000 -04= 00 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs =3D ahci_sdev_attrs, }; @@ -22133,18 +21926,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/ahci.c li= nux-2.6.32.38/drivers/ata/ahci.c .inherits =3D &ahci_ops, .softreset =3D ahci_sb600_softreset, .pmp_softreset =3D ahci_sb600_softreset, -@@ -692,7 +692,7 @@ static const struct pci_device_id ahci_p - { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, -=20 -- { } /* terminate list */ -+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ - }; -=20 -=20 -diff -urNp linux-2.6.32.38/drivers/ata/ata_generic.c linux-2.6.32.38/dri= vers/ata/ata_generic.c ---- linux-2.6.32.38/drivers/ata/ata_generic.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/ata_generic.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/ata_generic.c linux-2.6.32.39/dri= vers/ata/ata_generic.c +--- linux-2.6.32.39/drivers/ata/ata_generic.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/ata_generic.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -104,7 +104,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -22154,18 +21938,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/ata_gener= ic.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_unknown, .set_mode =3D generic_set_mode, -diff -urNp linux-2.6.32.38/drivers/ata/ata_piix.c linux-2.6.32.38/driver= s/ata/ata_piix.c ---- linux-2.6.32.38/drivers/ata/ata_piix.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/ata_piix.c 2011-04-17 15:56:46.000000000= -0400 -@@ -300,7 +300,7 @@ static const struct pci_device_id piix_p - { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, - /* SATA Controller IDE (CPT) */ - { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, -- { } /* terminate list */ -+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ - }; -=20 - static struct pci_driver piix_pci_driver =3D { +diff -urNp linux-2.6.32.39/drivers/ata/ata_piix.c linux-2.6.32.39/driver= s/ata/ata_piix.c +--- linux-2.6.32.39/drivers/ata/ata_piix.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/ata_piix.c 2011-04-23 12:56:10.000000000= -0400 @@ -318,7 +318,7 @@ static struct scsi_host_template piix_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -22202,27 +21977,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/ata_piix.= c linux-2.6.32.38/drivers/ata/at .inherits =3D &piix_sata_ops, .hardreset =3D sata_std_hardreset, .scr_read =3D piix_sidpr_scr_read, -@@ -617,7 +617,7 @@ static const struct ich_laptop ich_lapto - { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ - { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ - /* end marker */ -- { 0, } -+ { 0, 0, 0 } - }; -=20 - /** -@@ -1101,7 +1101,7 @@ static int piix_broken_suspend(void) - }, - }, -=20 -- { } /* terminate list */ -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } /* terminate list */ - }; - static const char *oemstrs[] =3D { - "Tecra M3,", -diff -urNp linux-2.6.32.38/drivers/ata/libata-acpi.c linux-2.6.32.38/dri= vers/ata/libata-acpi.c ---- linux-2.6.32.38/drivers/ata/libata-acpi.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/libata-acpi.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/libata-acpi.c linux-2.6.32.39/dri= vers/ata/libata-acpi.c +--- linux-2.6.32.39/drivers/ata/libata-acpi.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/libata-acpi.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -22238,36 +21995,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/libata-ac= pi.c linux-2.6.32.38/drivers/ata .handler =3D ata_acpi_ap_notify_dock, .uevent =3D ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.32.38/drivers/ata/libata-core.c linux-2.6.32.38/dri= vers/ata/libata-core.c ---- linux-2.6.32.38/drivers/ata/libata-core.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/libata-core.c 2011-04-17 15:56:46.000000= 000 -0400 -@@ -900,7 +900,7 @@ static const struct ata_xfer_ent { - { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, - { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, - { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 }, -- { -1, }, -+ { -1, 0, 0 } - }; -=20 - /** -@@ -3168,7 +3168,7 @@ static const struct ata_timing ata_timin - { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, - { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, -=20 -- { 0xFF } -+ { 0xFF, 0, 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - #define ENOUGH(v, unit) (((v)-1)/(unit)+1) -@@ -4393,7 +4393,7 @@ static const struct ata_blacklist_entry=20 - { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, -=20 - /* End Marker */ -- { } -+ { NULL, NULL, 0 } - }; -=20 - static int strn_pattern_cmp(const char *patt, const char *name, int wil= dchar) +diff -urNp linux-2.6.32.39/drivers/ata/libata-core.c linux-2.6.32.39/dri= vers/ata/libata-core.c +--- linux-2.6.32.39/drivers/ata/libata-core.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/libata-core.c 2011-04-23 12:56:10.000000= 000 -0400 @@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd * struct ata_port *ap; unsigned int tag; @@ -22332,9 +22062,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/libata-cor= e.c linux-2.6.32.38/drivers/ata .qc_prep =3D ata_noop_qc_prep, .qc_issue =3D ata_dummy_qc_issue, .error_handler =3D ata_dummy_error_handler, -diff -urNp linux-2.6.32.38/drivers/ata/libata-eh.c linux-2.6.32.38/drive= rs/ata/libata-eh.c ---- linux-2.6.32.38/drivers/ata/libata-eh.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/ata/libata-eh.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/libata-eh.c linux-2.6.32.39/drive= rs/ata/libata-eh.c +--- linux-2.6.32.39/drivers/ata/libata-eh.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/ata/libata-eh.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ void ata_std_error_handler(struct ata_port *ap) @@ -22344,9 +22074,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/libata-eh.= c linux-2.6.32.38/drivers/ata/l ata_reset_fn_t hardreset =3D ops->hardreset; =20 /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.32.38/drivers/ata/libata-pmp.c linux-2.6.32.38/driv= ers/ata/libata-pmp.c ---- linux-2.6.32.38/drivers/ata/libata-pmp.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/ata/libata-pmp.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/libata-pmp.c linux-2.6.32.39/driv= ers/ata/libata-pmp.c +--- linux-2.6.32.39/drivers/ata/libata-pmp.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/ata/libata-pmp.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -22356,9 +22086,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/libata-pmp= .c linux-2.6.32.38/drivers/ata/ int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link =3D &ap->link; struct ata_device *pmp_dev =3D pmp_link->device; -diff -urNp linux-2.6.32.38/drivers/ata/pata_acpi.c linux-2.6.32.38/drive= rs/ata/pata_acpi.c ---- linux-2.6.32.38/drivers/ata/pata_acpi.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_acpi.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_acpi.c linux-2.6.32.39/drive= rs/ata/pata_acpi.c +--- linux-2.6.32.39/drivers/ata/pata_acpi.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_acpi.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -22368,9 +22098,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_acpi.= c linux-2.6.32.38/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D pacpi_qc_issue, .cable_detect =3D pacpi_cable_detect, -diff -urNp linux-2.6.32.38/drivers/ata/pata_ali.c linux-2.6.32.38/driver= s/ata/pata_ali.c ---- linux-2.6.32.38/drivers/ata/pata_ali.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pata_ali.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_ali.c linux-2.6.32.39/driver= s/ata/pata_ali.c +--- linux-2.6.32.39/drivers/ata/pata_ali.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pata_ali.c 2011-04-17 15:56:46.000000000= -0400 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -22416,9 +22146,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ali.c= linux-2.6.32.38/drivers/ata/pa .inherits =3D &ali_dma_base_ops, .check_atapi_dma =3D ali_check_atapi_dma, .dev_config =3D ali_warn_atapi_dma, -diff -urNp linux-2.6.32.38/drivers/ata/pata_amd.c linux-2.6.32.38/driver= s/ata/pata_amd.c ---- linux-2.6.32.38/drivers/ata/pata_amd.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pata_amd.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_amd.c linux-2.6.32.39/driver= s/ata/pata_amd.c +--- linux-2.6.32.39/drivers/ata/pata_amd.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pata_amd.c 2011-04-17 15:56:46.000000000= -0400 @@ -397,28 +397,28 @@ static const struct ata_port_operations=20 .prereset =3D amd_pre_reset, }; @@ -22468,9 +22198,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_amd.c= linux-2.6.32.38/drivers/ata/pa .inherits =3D &nv_base_port_ops, .set_piomode =3D nv133_set_piomode, .set_dmamode =3D nv133_set_dmamode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_artop.c linux-2.6.32.38/driv= ers/ata/pata_artop.c ---- linux-2.6.32.38/drivers/ata/pata_artop.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_artop.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_artop.c linux-2.6.32.39/driv= ers/ata/pata_artop.c +--- linux-2.6.32.39/drivers/ata/pata_artop.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_artop.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -22489,9 +22219,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_artop= .c linux-2.6.32.38/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D artop6260_cable_detect, .set_piomode =3D artop6260_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_at32.c linux-2.6.32.38/drive= rs/ata/pata_at32.c ---- linux-2.6.32.38/drivers/ata/pata_at32.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_at32.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_at32.c linux-2.6.32.39/drive= rs/ata/pata_at32.c +--- linux-2.6.32.39/drivers/ata/pata_at32.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_at32.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -22501,9 +22231,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_at32.= c linux-2.6.32.38/drivers/ata/p .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D pata_at32_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_at91.c linux-2.6.32.38/drive= rs/ata/pata_at91.c ---- linux-2.6.32.38/drivers/ata/pata_at91.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_at91.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_at91.c linux-2.6.32.39/drive= rs/ata/pata_at91.c +--- linux-2.6.32.39/drivers/ata/pata_at91.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_at91.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -22513,9 +22243,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_at91.= c linux-2.6.32.38/drivers/ata/p .inherits =3D &ata_sff_port_ops, =20 .sff_data_xfer =3D pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.32.38/drivers/ata/pata_atiixp.c linux-2.6.32.38/dri= vers/ata/pata_atiixp.c ---- linux-2.6.32.38/drivers/ata/pata_atiixp.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_atiixp.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_atiixp.c linux-2.6.32.39/dri= vers/ata/pata_atiixp.c +--- linux-2.6.32.39/drivers/ata/pata_atiixp.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_atiixp.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -22525,9 +22255,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_atiix= p.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, =20 .qc_prep =3D ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.38/drivers/ata/pata_atp867x.c linux-2.6.32.38/dr= ivers/ata/pata_atp867x.c ---- linux-2.6.32.38/drivers/ata/pata_atp867x.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_atp867x.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_atp867x.c linux-2.6.32.39/dr= ivers/ata/pata_atp867x.c +--- linux-2.6.32.39/drivers/ata/pata_atp867x.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_atp867x.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -22537,9 +22267,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_atp86= 7x.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D atp867x_cable_detect, .set_piomode =3D atp867x_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_bf54x.c linux-2.6.32.38/driv= ers/ata/pata_bf54x.c ---- linux-2.6.32.38/drivers/ata/pata_bf54x.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_bf54x.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_bf54x.c linux-2.6.32.39/driv= ers/ata/pata_bf54x.c +--- linux-2.6.32.39/drivers/ata/pata_bf54x.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_bf54x.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -22549,9 +22279,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_bf54x= .c linux-2.6.32.38/drivers/ata/ .inherits =3D &ata_sff_port_ops, =20 .set_piomode =3D bfin_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_cmd640.c linux-2.6.32.38/dri= vers/ata/pata_cmd640.c ---- linux-2.6.32.38/drivers/ata/pata_cmd640.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_cmd640.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_cmd640.c linux-2.6.32.39/dri= vers/ata/pata_cmd640.c +--- linux-2.6.32.39/drivers/ata/pata_cmd640.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_cmd640.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22561,9 +22291,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cmd64= 0.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer =3D ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.32.38/drivers/ata/pata_cmd64x.c linux-2.6.32.38/dri= vers/ata/pata_cmd64x.c ---- linux-2.6.32.38/drivers/ata/pata_cmd64x.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_cmd64x.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_cmd64x.c linux-2.6.32.39/dri= vers/ata/pata_cmd64x.c +--- linux-2.6.32.39/drivers/ata/pata_cmd64x.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_cmd64x.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -275,18 +275,18 @@ static const struct ata_port_operations=20 .set_dmamode =3D cmd64x_set_dmamode, }; @@ -22586,9 +22316,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cmd64= x.c linux-2.6.32.38/drivers/ata .inherits =3D &cmd64x_base_ops, .bmdma_stop =3D cmd648_bmdma_stop, .cable_detect =3D cmd648_cable_detect, -diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5520.c linux-2.6.32.38/dri= vers/ata/pata_cs5520.c ---- linux-2.6.32.38/drivers/ata/pata_cs5520.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_cs5520.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5520.c linux-2.6.32.39/dri= vers/ata/pata_cs5520.c +--- linux-2.6.32.39/drivers/ata/pata_cs5520.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_cs5520.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -22598,9 +22328,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cs552= 0.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, .qc_prep =3D ata_sff_dumb_qc_prep, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5530.c linux-2.6.32.38/dri= vers/ata/pata_cs5530.c ---- linux-2.6.32.38/drivers/ata/pata_cs5530.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_cs5530.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5530.c linux-2.6.32.39/dri= vers/ata/pata_cs5530.c +--- linux-2.6.32.39/drivers/ata/pata_cs5530.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_cs5530.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -22610,9 +22340,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cs553= 0.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, =20 .qc_prep =3D ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5535.c linux-2.6.32.38/dri= vers/ata/pata_cs5535.c ---- linux-2.6.32.38/drivers/ata/pata_cs5535.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_cs5535.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5535.c linux-2.6.32.39/dri= vers/ata/pata_cs5535.c +--- linux-2.6.32.39/drivers/ata/pata_cs5535.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_cs5535.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22622,9 +22352,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cs553= 5.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D cs5535_cable_detect, .set_piomode =3D cs5535_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5536.c linux-2.6.32.38/dri= vers/ata/pata_cs5536.c ---- linux-2.6.32.38/drivers/ata/pata_cs5536.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_cs5536.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5536.c linux-2.6.32.39/dri= vers/ata/pata_cs5536.c +--- linux-2.6.32.39/drivers/ata/pata_cs5536.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_cs5536.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22634,9 +22364,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cs553= 6.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D cs5536_cable_detect, .set_piomode =3D cs5536_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_cypress.c linux-2.6.32.38/dr= ivers/ata/pata_cypress.c ---- linux-2.6.32.38/drivers/ata/pata_cypress.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_cypress.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_cypress.c linux-2.6.32.39/dr= ivers/ata/pata_cypress.c +--- linux-2.6.32.39/drivers/ata/pata_cypress.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_cypress.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -22646,9 +22376,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cypre= ss.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D cy82c693_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_efar.c linux-2.6.32.38/drive= rs/ata/pata_efar.c ---- linux-2.6.32.38/drivers/ata/pata_efar.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_efar.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_efar.c linux-2.6.32.39/drive= rs/ata/pata_efar.c +--- linux-2.6.32.39/drivers/ata/pata_efar.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_efar.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -22658,9 +22388,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_efar.= c linux-2.6.32.38/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D efar_cable_detect, .set_piomode =3D efar_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt366.c linux-2.6.32.38/dri= vers/ata/pata_hpt366.c ---- linux-2.6.32.38/drivers/ata/pata_hpt366.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_hpt366.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt366.c linux-2.6.32.39/dri= vers/ata/pata_hpt366.c +--- linux-2.6.32.39/drivers/ata/pata_hpt366.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_hpt366.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -22670,9 +22400,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt36= 6.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D hpt36x_cable_detect, .mode_filter =3D hpt366_filter, -diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt37x.c linux-2.6.32.38/dri= vers/ata/pata_hpt37x.c ---- linux-2.6.32.38/drivers/ata/pata_hpt37x.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_hpt37x.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt37x.c linux-2.6.32.39/dri= vers/ata/pata_hpt37x.c +--- linux-2.6.32.39/drivers/ata/pata_hpt37x.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_hpt37x.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -22709,9 +22439,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt37= x.c linux-2.6.32.38/drivers/ata .inherits =3D &hpt372_port_ops, .prereset =3D hpt374_fn1_pre_reset, }; -diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt3x2n.c linux-2.6.32.38/dr= ivers/ata/pata_hpt3x2n.c ---- linux-2.6.32.38/drivers/ata/pata_hpt3x2n.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_hpt3x2n.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c linux-2.6.32.39/dr= ivers/ata/pata_hpt3x2n.c +--- linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -22721,9 +22451,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt3x= 2n.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, =20 .bmdma_stop =3D hpt3x2n_bmdma_stop, -diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt3x3.c linux-2.6.32.38/dri= vers/ata/pata_hpt3x3.c ---- linux-2.6.32.38/drivers/ata/pata_hpt3x3.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_hpt3x3.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt3x3.c linux-2.6.32.39/dri= vers/ata/pata_hpt3x3.c +--- linux-2.6.32.39/drivers/ata/pata_hpt3x3.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_hpt3x3.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22733,9 +22463,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt3x= 3.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D hpt3x3_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_icside.c linux-2.6.32.38/dri= vers/ata/pata_icside.c ---- linux-2.6.32.38/drivers/ata/pata_icside.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_icside.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_icside.c linux-2.6.32.39/dri= vers/ata/pata_icside.c +--- linux-2.6.32.39/drivers/ata/pata_icside.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_icside.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -22745,9 +22475,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_icsid= e.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_sff_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep =3D ata_noop_qc_prep, -diff -urNp linux-2.6.32.38/drivers/ata/pata_isapnp.c linux-2.6.32.38/dri= vers/ata/pata_isapnp.c ---- linux-2.6.32.38/drivers/ata/pata_isapnp.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_isapnp.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_isapnp.c linux-2.6.32.39/dri= vers/ata/pata_isapnp.c +--- linux-2.6.32.39/drivers/ata/pata_isapnp.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_isapnp.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -22763,9 +22493,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_isapn= p.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.32.38/drivers/ata/pata_it8213.c linux-2.6.32.38/dri= vers/ata/pata_it8213.c ---- linux-2.6.32.38/drivers/ata/pata_it8213.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_it8213.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_it8213.c linux-2.6.32.39/dri= vers/ata/pata_it8213.c +--- linux-2.6.32.39/drivers/ata/pata_it8213.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_it8213.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; =20 @@ -22775,9 +22505,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_it821= 3.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D it8213_cable_detect, .set_piomode =3D it8213_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_it821x.c linux-2.6.32.38/dri= vers/ata/pata_it821x.c ---- linux-2.6.32.38/drivers/ata/pata_it821x.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_it821x.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_it821x.c linux-2.6.32.39/dri= vers/ata/pata_it821x.c +--- linux-2.6.32.39/drivers/ata/pata_it821x.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_it821x.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22805,9 +22535,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_it821= x.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, =20 .check_atapi_dma=3D it821x_check_atapi_dma, -diff -urNp linux-2.6.32.38/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.38/= drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.32.38/drivers/ata/pata_ixp4xx_cf.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.39/= drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -22817,9 +22547,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ixp4x= x_cf.c linux-2.6.32.38/drivers/ .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ixp4xx_mmio_data_xfer, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.32.38/drivers/ata/pata_jmicron.c linux-2.6.32.38/dr= ivers/ata/pata_jmicron.c ---- linux-2.6.32.38/drivers/ata/pata_jmicron.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_jmicron.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_jmicron.c linux-2.6.32.39/dr= ivers/ata/pata_jmicron.c +--- linux-2.6.32.39/drivers/ata/pata_jmicron.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_jmicron.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -22829,9 +22559,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_jmicr= on.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .prereset =3D jmicron_pre_reset, }; -diff -urNp linux-2.6.32.38/drivers/ata/pata_legacy.c linux-2.6.32.38/dri= vers/ata/pata_legacy.c ---- linux-2.6.32.38/drivers/ata/pata_legacy.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_legacy.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_legacy.c linux-2.6.32.39/dri= vers/ata/pata_legacy.c +--- linux-2.6.32.39/drivers/ata/pata_legacy.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_legacy.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -106,7 +106,7 @@ struct legacy_probe { =20 struct legacy_controller { @@ -22943,9 +22673,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_legac= y.c linux-2.6.32.38/drivers/ata struct legacy_data *ld =3D &legacy_data[probe->slot]; struct ata_host *host =3D NULL; struct ata_port *ap; -diff -urNp linux-2.6.32.38/drivers/ata/pata_marvell.c linux-2.6.32.38/dr= ivers/ata/pata_marvell.c ---- linux-2.6.32.38/drivers/ata/pata_marvell.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_marvell.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_marvell.c linux-2.6.32.39/dr= ivers/ata/pata_marvell.c +--- linux-2.6.32.39/drivers/ata/pata_marvell.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_marvell.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -22955,9 +22685,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_marve= ll.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D marvell_cable_detect, .prereset =3D marvell_pre_reset, -diff -urNp linux-2.6.32.38/drivers/ata/pata_mpc52xx.c linux-2.6.32.38/dr= ivers/ata/pata_mpc52xx.c ---- linux-2.6.32.38/drivers/ata/pata_mpc52xx.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_mpc52xx.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_mpc52xx.c linux-2.6.32.39/dr= ivers/ata/pata_mpc52xx.c +--- linux-2.6.32.39/drivers/ata/pata_mpc52xx.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_mpc52xx.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -22967,9 +22697,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_mpc52= xx.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .sff_dev_select =3D mpc52xx_ata_dev_select, .set_piomode =3D mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_mpiix.c linux-2.6.32.38/driv= ers/ata/pata_mpiix.c ---- linux-2.6.32.38/drivers/ata/pata_mpiix.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_mpiix.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_mpiix.c linux-2.6.32.39/driv= ers/ata/pata_mpiix.c +--- linux-2.6.32.39/drivers/ata/pata_mpiix.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_mpiix.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -22979,9 +22709,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_mpiix= .c linux-2.6.32.38/drivers/ata/ .inherits =3D &ata_sff_port_ops, .qc_issue =3D mpiix_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.32.38/drivers/ata/pata_netcell.c linux-2.6.32.38/dr= ivers/ata/pata_netcell.c ---- linux-2.6.32.38/drivers/ata/pata_netcell.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_netcell.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_netcell.c linux-2.6.32.39/dr= ivers/ata/pata_netcell.c +--- linux-2.6.32.39/drivers/ata/pata_netcell.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_netcell.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -22991,9 +22721,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_netce= ll.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_80wire, .read_id =3D netcell_read_id, -diff -urNp linux-2.6.32.38/drivers/ata/pata_ninja32.c linux-2.6.32.38/dr= ivers/ata/pata_ninja32.c ---- linux-2.6.32.38/drivers/ata/pata_ninja32.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_ninja32.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_ninja32.c linux-2.6.32.39/dr= ivers/ata/pata_ninja32.c +--- linux-2.6.32.39/drivers/ata/pata_ninja32.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_ninja32.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -23003,9 +22733,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ninja= 32.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .sff_dev_select =3D ninja32_dev_select, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.32.38/drivers/ata/pata_ns87410.c linux-2.6.32.38/dr= ivers/ata/pata_ns87410.c ---- linux-2.6.32.38/drivers/ata/pata_ns87410.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_ns87410.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_ns87410.c linux-2.6.32.39/dr= ivers/ata/pata_ns87410.c +--- linux-2.6.32.39/drivers/ata/pata_ns87410.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_ns87410.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -23015,9 +22745,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ns874= 10.c linux-2.6.32.38/drivers/at .inherits =3D &ata_sff_port_ops, .qc_issue =3D ns87410_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.32.38/drivers/ata/pata_ns87415.c linux-2.6.32.38/dr= ivers/ata/pata_ns87415.c ---- linux-2.6.32.38/drivers/ata/pata_ns87415.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_ns87415.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_ns87415.c linux-2.6.32.39/dr= ivers/ata/pata_ns87415.c +--- linux-2.6.32.39/drivers/ata/pata_ns87415.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_ns87415.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -23036,9 +22766,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ns874= 15.c linux-2.6.32.38/drivers/at .inherits =3D &ns87415_pata_ops, .sff_tf_read =3D ns87560_tf_read, .sff_check_status =3D ns87560_check_status, -diff -urNp linux-2.6.32.38/drivers/ata/pata_octeon_cf.c linux-2.6.32.38/= drivers/ata/pata_octeon_cf.c ---- linux-2.6.32.38/drivers/ata/pata_octeon_cf.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_octeon_cf.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_octeon_cf.c linux-2.6.32.39/= drivers/ata/pata_octeon_cf.c +--- linux-2.6.32.39/drivers/ata/pata_octeon_cf.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_octeon_cf.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -23047,9 +22777,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_octeo= n_cf.c linux-2.6.32.38/drivers/ static struct ata_port_operations octeon_cf_ops =3D { .inherits =3D &ata_sff_port_ops, .check_atapi_dma =3D octeon_cf_check_atapi_dma, -diff -urNp linux-2.6.32.38/drivers/ata/pata_oldpiix.c linux-2.6.32.38/dr= ivers/ata/pata_oldpiix.c ---- linux-2.6.32.38/drivers/ata/pata_oldpiix.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_oldpiix.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_oldpiix.c linux-2.6.32.39/dr= ivers/ata/pata_oldpiix.c +--- linux-2.6.32.39/drivers/ata/pata_oldpiix.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_oldpiix.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -23059,9 +22789,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_oldpi= ix.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D oldpiix_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.32.38/drivers/ata/pata_opti.c linux-2.6.32.38/drive= rs/ata/pata_opti.c ---- linux-2.6.32.38/drivers/ata/pata_opti.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_opti.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_opti.c linux-2.6.32.39/drive= rs/ata/pata_opti.c +--- linux-2.6.32.39/drivers/ata/pata_opti.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_opti.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -23071,9 +22801,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_opti.= c linux-2.6.32.38/drivers/ata/p .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D opti_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_optidma.c linux-2.6.32.38/dr= ivers/ata/pata_optidma.c ---- linux-2.6.32.38/drivers/ata/pata_optidma.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_optidma.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_optidma.c linux-2.6.32.39/dr= ivers/ata/pata_optidma.c +--- linux-2.6.32.39/drivers/ata/pata_optidma.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_optidma.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -23092,9 +22822,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_optid= ma.c linux-2.6.32.38/drivers/at .inherits =3D &optidma_port_ops, .set_piomode =3D optiplus_set_pio_mode, .set_dmamode =3D optiplus_set_dma_mode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_palmld.c linux-2.6.32.38/dri= vers/ata/pata_palmld.c ---- linux-2.6.32.38/drivers/ata/pata_palmld.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_palmld.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_palmld.c linux-2.6.32.39/dri= vers/ata/pata_palmld.c +--- linux-2.6.32.39/drivers/ata/pata_palmld.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_palmld.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -23104,9 +22834,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_palml= d.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.32.38/drivers/ata/pata_pcmcia.c linux-2.6.32.38/dri= vers/ata/pata_pcmcia.c ---- linux-2.6.32.38/drivers/ata/pata_pcmcia.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_pcmcia.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_pcmcia.c linux-2.6.32.39/dri= vers/ata/pata_pcmcia.c +--- linux-2.6.32.39/drivers/ata/pata_pcmcia.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_pcmcia.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -23133,9 +22863,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_pcmci= a.c linux-2.6.32.38/drivers/ata =20 info =3D kzalloc(sizeof(*info), GFP_KERNEL); if (info =3D=3D NULL) -diff -urNp linux-2.6.32.38/drivers/ata/pata_pdc2027x.c linux-2.6.32.38/d= rivers/ata/pata_pdc2027x.c ---- linux-2.6.32.38/drivers/ata/pata_pdc2027x.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_pdc2027x.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_pdc2027x.c linux-2.6.32.39/d= rivers/ata/pata_pdc2027x.c +--- linux-2.6.32.39/drivers/ata/pata_pdc2027x.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_pdc2027x.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -23153,9 +22883,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_pdc20= 27x.c linux-2.6.32.38/drivers/a .inherits =3D &pdc2027x_pata100_ops, .mode_filter =3D pdc2027x_mode_filter, .set_piomode =3D pdc2027x_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.= 38/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.32.38/drivers/ata/pata_pdc202xx_old.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.= 39/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -23174,9 +22904,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_pdc20= 2xx_old.c linux-2.6.32.38/drive .inherits =3D &pdc2024x_port_ops, =20 .check_atapi_dma =3D pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.32.38/drivers/ata/pata_platform.c linux-2.6.32.38/d= rivers/ata/pata_platform.c ---- linux-2.6.32.38/drivers/ata/pata_platform.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_platform.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_platform.c linux-2.6.32.39/d= rivers/ata/pata_platform.c +--- linux-2.6.32.39/drivers/ata/pata_platform.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_platform.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -23186,9 +22916,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_platf= orm.c linux-2.6.32.38/drivers/a .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, .cable_detect =3D ata_cable_unknown, -diff -urNp linux-2.6.32.38/drivers/ata/pata_qdi.c linux-2.6.32.38/driver= s/ata/pata_qdi.c ---- linux-2.6.32.38/drivers/ata/pata_qdi.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pata_qdi.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_qdi.c linux-2.6.32.39/driver= s/ata/pata_qdi.c +--- linux-2.6.32.39/drivers/ata/pata_qdi.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pata_qdi.c 2011-04-17 15:56:46.000000000= -0400 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -23207,9 +22937,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_qdi.c= linux-2.6.32.38/drivers/ata/pa .inherits =3D &qdi6500_port_ops, .set_piomode =3D qdi6580_set_piomode, }; -diff -urNp linux-2.6.32.38/drivers/ata/pata_radisys.c linux-2.6.32.38/dr= ivers/ata/pata_radisys.c ---- linux-2.6.32.38/drivers/ata/pata_radisys.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_radisys.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_radisys.c linux-2.6.32.39/dr= ivers/ata/pata_radisys.c +--- linux-2.6.32.39/drivers/ata/pata_radisys.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_radisys.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -23219,9 +22949,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_radis= ys.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D radisys_qc_issue, .cable_detect =3D ata_cable_unknown, -diff -urNp linux-2.6.32.38/drivers/ata/pata_rb532_cf.c linux-2.6.32.38/d= rivers/ata/pata_rb532_cf.c ---- linux-2.6.32.38/drivers/ata/pata_rb532_cf.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_rb532_cf.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_rb532_cf.c linux-2.6.32.39/d= rivers/ata/pata_rb532_cf.c +--- linux-2.6.32.39/drivers/ata/pata_rb532_cf.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_rb532_cf.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -23231,9 +22961,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_rb532= _cf.c linux-2.6.32.38/drivers/a .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer32, }; -diff -urNp linux-2.6.32.38/drivers/ata/pata_rdc.c linux-2.6.32.38/driver= s/ata/pata_rdc.c ---- linux-2.6.32.38/drivers/ata/pata_rdc.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pata_rdc.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_rdc.c linux-2.6.32.39/driver= s/ata/pata_rdc.c +--- linux-2.6.32.39/drivers/ata/pata_rdc.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pata_rdc.c 2011-04-17 15:56:46.000000000= -0400 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -23243,9 +22973,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_rdc.c= linux-2.6.32.38/drivers/ata/pa .inherits =3D &ata_bmdma32_port_ops, .cable_detect =3D rdc_pata_cable_detect, .set_piomode =3D rdc_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_rz1000.c linux-2.6.32.38/dri= vers/ata/pata_rz1000.c ---- linux-2.6.32.38/drivers/ata/pata_rz1000.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_rz1000.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_rz1000.c linux-2.6.32.39/dri= vers/ata/pata_rz1000.c +--- linux-2.6.32.39/drivers/ata/pata_rz1000.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_rz1000.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -23255,9 +22985,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_rz100= 0.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_mode =3D rz1000_set_mode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_sc1200.c linux-2.6.32.38/dri= vers/ata/pata_sc1200.c ---- linux-2.6.32.38/drivers/ata/pata_sc1200.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_sc1200.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_sc1200.c linux-2.6.32.39/dri= vers/ata/pata_sc1200.c +--- linux-2.6.32.39/drivers/ata/pata_sc1200.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_sc1200.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -23267,9 +22997,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sc120= 0.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma_port_ops, .qc_prep =3D ata_sff_dumb_qc_prep, .qc_issue =3D sc1200_qc_issue, -diff -urNp linux-2.6.32.38/drivers/ata/pata_scc.c linux-2.6.32.38/driver= s/ata/pata_scc.c ---- linux-2.6.32.38/drivers/ata/pata_scc.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pata_scc.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_scc.c linux-2.6.32.39/driver= s/ata/pata_scc.c +--- linux-2.6.32.39/drivers/ata/pata_scc.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pata_scc.c 2011-04-17 15:56:46.000000000= -0400 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -23279,9 +23009,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_scc.c= linux-2.6.32.38/drivers/ata/pa .inherits =3D &ata_bmdma_port_ops, =20 .set_piomode =3D scc_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_sch.c linux-2.6.32.38/driver= s/ata/pata_sch.c ---- linux-2.6.32.38/drivers/ata/pata_sch.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pata_sch.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_sch.c linux-2.6.32.39/driver= s/ata/pata_sch.c +--- linux-2.6.32.39/drivers/ata/pata_sch.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pata_sch.c 2011-04-17 15:56:46.000000000= -0400 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -23291,9 +23021,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sch.c= linux-2.6.32.38/drivers/ata/pa .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_unknown, .set_piomode =3D sch_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_serverworks.c linux-2.6.32.3= 8/drivers/ata/pata_serverworks.c ---- linux-2.6.32.38/drivers/ata/pata_serverworks.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_serverworks.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_serverworks.c linux-2.6.32.3= 9/drivers/ata/pata_serverworks.c +--- linux-2.6.32.39/drivers/ata/pata_serverworks.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_serverworks.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -23312,9 +23042,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_serve= rworks.c linux-2.6.32.38/driver .inherits =3D &serverworks_osb4_port_ops, .mode_filter =3D serverworks_csb_filter, }; -diff -urNp linux-2.6.32.38/drivers/ata/pata_sil680.c linux-2.6.32.38/dri= vers/ata/pata_sil680.c ---- linux-2.6.32.38/drivers/ata/pata_sil680.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_sil680.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_sil680.c linux-2.6.32.39/dri= vers/ata/pata_sil680.c +--- linux-2.6.32.39/drivers/ata/pata_sil680.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_sil680.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -23324,9 +23054,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sil68= 0.c linux-2.6.32.38/drivers/ata .inherits =3D &ata_bmdma32_port_ops, .cable_detect =3D sil680_cable_detect, .set_piomode =3D sil680_set_piomode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_sis.c linux-2.6.32.38/driver= s/ata/pata_sis.c ---- linux-2.6.32.38/drivers/ata/pata_sis.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pata_sis.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_sis.c linux-2.6.32.39/driver= s/ata/pata_sis.c +--- linux-2.6.32.39/drivers/ata/pata_sis.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pata_sis.c 2011-04-17 15:56:46.000000000= -0400 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -23382,9 +23112,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sis.c= linux-2.6.32.38/drivers/ata/pa .inherits =3D &sis_base_ops, .set_piomode =3D sis_old_set_piomode, .set_dmamode =3D sis_old_set_dmamode, -diff -urNp linux-2.6.32.38/drivers/ata/pata_sl82c105.c linux-2.6.32.38/d= rivers/ata/pata_sl82c105.c ---- linux-2.6.32.38/drivers/ata/pata_sl82c105.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_sl82c105.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_sl82c105.c linux-2.6.32.39/d= rivers/ata/pata_sl82c105.c +--- linux-2.6.32.39/drivers/ata/pata_sl82c105.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_sl82c105.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -23394,9 +23124,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sl82c= 105.c linux-2.6.32.38/drivers/a .inherits =3D &ata_bmdma_port_ops, .qc_defer =3D sl82c105_qc_defer, .bmdma_start =3D sl82c105_bmdma_start, -diff -urNp linux-2.6.32.38/drivers/ata/pata_triflex.c linux-2.6.32.38/dr= ivers/ata/pata_triflex.c ---- linux-2.6.32.38/drivers/ata/pata_triflex.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_triflex.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_triflex.c linux-2.6.32.39/dr= ivers/ata/pata_triflex.c +--- linux-2.6.32.39/drivers/ata/pata_triflex.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_triflex.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -23406,9 +23136,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_trifl= ex.c linux-2.6.32.38/drivers/at .inherits =3D &ata_bmdma_port_ops, .bmdma_start =3D triflex_bmdma_start, .bmdma_stop =3D triflex_bmdma_stop, -diff -urNp linux-2.6.32.38/drivers/ata/pata_via.c linux-2.6.32.38/driver= s/ata/pata_via.c ---- linux-2.6.32.38/drivers/ata/pata_via.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pata_via.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_via.c linux-2.6.32.39/driver= s/ata/pata_via.c +--- linux-2.6.32.39/drivers/ata/pata_via.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pata_via.c 2011-04-17 15:56:46.000000000= -0400 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -23427,9 +23157,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_via.c= linux-2.6.32.38/drivers/ata/pa .inherits =3D &via_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.32.38/drivers/ata/pata_winbond.c linux-2.6.32.38/dr= ivers/ata/pata_winbond.c ---- linux-2.6.32.38/drivers/ata/pata_winbond.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/pata_winbond.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pata_winbond.c linux-2.6.32.39/dr= ivers/ata/pata_winbond.c +--- linux-2.6.32.39/drivers/ata/pata_winbond.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/pata_winbond.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -23439,9 +23169,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_winbo= nd.c linux-2.6.32.38/drivers/at .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D winbond_data_xfer, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.32.38/drivers/ata/pdc_adma.c linux-2.6.32.38/driver= s/ata/pdc_adma.c ---- linux-2.6.32.38/drivers/ata/pdc_adma.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/pdc_adma.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/pdc_adma.c linux-2.6.32.39/driver= s/ata/pdc_adma.c +--- linux-2.6.32.39/drivers/ata/pdc_adma.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/pdc_adma.c 2011-04-17 15:56:46.000000000= -0400 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary =3D ADMA_DMA_BOUNDARY, }; @@ -23451,9 +23181,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pdc_adma.c= linux-2.6.32.38/drivers/ata/pd .inherits =3D &ata_sff_port_ops, =20 .lost_interrupt =3D ATA_OP_NULL, -diff -urNp linux-2.6.32.38/drivers/ata/sata_fsl.c linux-2.6.32.38/driver= s/ata/sata_fsl.c ---- linux-2.6.32.38/drivers/ata/sata_fsl.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/sata_fsl.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_fsl.c linux-2.6.32.39/driver= s/ata/sata_fsl.c +--- linux-2.6.32.39/drivers/ata/sata_fsl.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/sata_fsl.c 2011-04-17 15:56:46.000000000= -0400 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -23463,9 +23193,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_fsl.c= linux-2.6.32.38/drivers/ata/sa .inherits =3D &sata_pmp_port_ops, =20 .qc_defer =3D ata_std_qc_defer, -diff -urNp linux-2.6.32.38/drivers/ata/sata_inic162x.c linux-2.6.32.38/d= rivers/ata/sata_inic162x.c ---- linux-2.6.32.38/drivers/ata/sata_inic162x.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/ata/sata_inic162x.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_inic162x.c linux-2.6.32.39/d= rivers/ata/sata_inic162x.c +--- linux-2.6.32.39/drivers/ata/sata_inic162x.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/ata/sata_inic162x.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -23475,9 +23205,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_inic1= 62x.c linux-2.6.32.38/drivers/a .inherits =3D &sata_port_ops, =20 .check_atapi_dma =3D inic_check_atapi_dma, -diff -urNp linux-2.6.32.38/drivers/ata/sata_mv.c linux-2.6.32.38/drivers= /ata/sata_mv.c ---- linux-2.6.32.38/drivers/ata/sata_mv.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/ata/sata_mv.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_mv.c linux-2.6.32.39/drivers= /ata/sata_mv.c +--- linux-2.6.32.39/drivers/ata/sata_mv.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/ata/sata_mv.c 2011-04-17 15:56:46.000000000 = -0400 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary =3D MV_DMA_BOUNDARY, }; @@ -23505,9 +23235,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_mv.c = linux-2.6.32.38/drivers/ata/sat .inherits =3D &mv6_ops, .dev_config =3D ATA_OP_NULL, .qc_prep =3D mv_qc_prep_iie, -diff -urNp linux-2.6.32.38/drivers/ata/sata_nv.c linux-2.6.32.38/drivers= /ata/sata_nv.c ---- linux-2.6.32.38/drivers/ata/sata_nv.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/ata/sata_nv.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_nv.c linux-2.6.32.39/drivers= /ata/sata_nv.c +--- linux-2.6.32.39/drivers/ata/sata_nv.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/ata/sata_nv.c 2011-04-17 15:56:46.000000000 = -0400 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc * cases. Define nv_hardreset() which only kicks in for post-boot * probing and use it for all variants. @@ -23550,9 +23280,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_nv.c = linux-2.6.32.38/drivers/ata/sat .inherits =3D &nv_generic_ops, =20 .qc_defer =3D ata_std_qc_defer, -diff -urNp linux-2.6.32.38/drivers/ata/sata_promise.c linux-2.6.32.38/dr= ivers/ata/sata_promise.c ---- linux-2.6.32.38/drivers/ata/sata_promise.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ata/sata_promise.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_promise.c linux-2.6.32.39/dr= ivers/ata/sata_promise.c +--- linux-2.6.32.39/drivers/ata/sata_promise.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/ata/sata_promise.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -195,7 +195,7 @@ static const struct ata_port_operations=20 .error_handler =3D pdc_error_handler, }; @@ -23579,9 +23309,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_promi= se.c linux-2.6.32.38/drivers/at .inherits =3D &pdc_common_ops, .cable_detect =3D pdc_pata_cable_detect, .freeze =3D pdc_freeze, -diff -urNp linux-2.6.32.38/drivers/ata/sata_qstor.c linux-2.6.32.38/driv= ers/ata/sata_qstor.c ---- linux-2.6.32.38/drivers/ata/sata_qstor.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/ata/sata_qstor.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_qstor.c linux-2.6.32.39/driv= ers/ata/sata_qstor.c +--- linux-2.6.32.39/drivers/ata/sata_qstor.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/ata/sata_qstor.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary =3D QS_DMA_BOUNDARY, }; @@ -23591,9 +23321,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_qstor= .c linux-2.6.32.38/drivers/ata/ .inherits =3D &ata_sff_port_ops, =20 .check_atapi_dma =3D qs_check_atapi_dma, -diff -urNp linux-2.6.32.38/drivers/ata/sata_sil24.c linux-2.6.32.38/driv= ers/ata/sata_sil24.c ---- linux-2.6.32.38/drivers/ata/sata_sil24.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/ata/sata_sil24.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_sil24.c linux-2.6.32.39/driv= ers/ata/sata_sil24.c +--- linux-2.6.32.39/drivers/ata/sata_sil24.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/ata/sata_sil24.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -23603,9 +23333,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_sil24= .c linux-2.6.32.38/drivers/ata/ .inherits =3D &sata_pmp_port_ops, =20 .qc_defer =3D sil24_qc_defer, -diff -urNp linux-2.6.32.38/drivers/ata/sata_sil.c linux-2.6.32.38/driver= s/ata/sata_sil.c ---- linux-2.6.32.38/drivers/ata/sata_sil.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/sata_sil.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_sil.c linux-2.6.32.39/driver= s/ata/sata_sil.c +--- linux-2.6.32.39/drivers/ata/sata_sil.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/sata_sil.c 2011-04-17 15:56:46.000000000= -0400 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize =3D ATA_MAX_PRD }; @@ -23615,9 +23345,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_sil.c= linux-2.6.32.38/drivers/ata/sa .inherits =3D &ata_bmdma32_port_ops, .dev_config =3D sil_dev_config, .set_mode =3D sil_set_mode, -diff -urNp linux-2.6.32.38/drivers/ata/sata_sis.c linux-2.6.32.38/driver= s/ata/sata_sis.c ---- linux-2.6.32.38/drivers/ata/sata_sis.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/sata_sis.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_sis.c linux-2.6.32.39/driver= s/ata/sata_sis.c +--- linux-2.6.32.39/drivers/ata/sata_sis.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/sata_sis.c 2011-04-17 15:56:46.000000000= -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -23627,9 +23357,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_sis.c= linux-2.6.32.38/drivers/ata/sa .inherits =3D &ata_bmdma_port_ops, .scr_read =3D sis_scr_read, .scr_write =3D sis_scr_write, -diff -urNp linux-2.6.32.38/drivers/ata/sata_svw.c linux-2.6.32.38/driver= s/ata/sata_svw.c ---- linux-2.6.32.38/drivers/ata/sata_svw.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/sata_svw.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_svw.c linux-2.6.32.39/driver= s/ata/sata_svw.c +--- linux-2.6.32.39/drivers/ata/sata_svw.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/sata_svw.c 2011-04-17 15:56:46.000000000= -0400 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; =20 @@ -23639,9 +23369,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_svw.c= linux-2.6.32.38/drivers/ata/sa .inherits =3D &ata_bmdma_port_ops, .sff_tf_load =3D k2_sata_tf_load, .sff_tf_read =3D k2_sata_tf_read, -diff -urNp linux-2.6.32.38/drivers/ata/sata_sx4.c linux-2.6.32.38/driver= s/ata/sata_sx4.c ---- linux-2.6.32.38/drivers/ata/sata_sx4.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/sata_sx4.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_sx4.c linux-2.6.32.39/driver= s/ata/sata_sx4.c +--- linux-2.6.32.39/drivers/ata/sata_sx4.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/sata_sx4.c 2011-04-17 15:56:46.000000000= -0400 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; =20 @@ -23651,9 +23381,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_sx4.c= linux-2.6.32.38/drivers/ata/sa .inherits =3D &ata_sff_port_ops, =20 .check_atapi_dma =3D pdc_check_atapi_dma, -diff -urNp linux-2.6.32.38/drivers/ata/sata_uli.c linux-2.6.32.38/driver= s/ata/sata_uli.c ---- linux-2.6.32.38/drivers/ata/sata_uli.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/sata_uli.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_uli.c linux-2.6.32.39/driver= s/ata/sata_uli.c +--- linux-2.6.32.39/drivers/ata/sata_uli.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/sata_uli.c 2011-04-17 15:56:46.000000000= -0400 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -23663,9 +23393,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_uli.c= linux-2.6.32.38/drivers/ata/sa .inherits =3D &ata_bmdma_port_ops, .scr_read =3D uli_scr_read, .scr_write =3D uli_scr_write, -diff -urNp linux-2.6.32.38/drivers/ata/sata_via.c linux-2.6.32.38/driver= s/ata/sata_via.c ---- linux-2.6.32.38/drivers/ata/sata_via.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/sata_via.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_via.c linux-2.6.32.39/driver= s/ata/sata_via.c +--- linux-2.6.32.39/drivers/ata/sata_via.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/sata_via.c 2011-04-17 15:56:46.000000000= -0400 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -23703,9 +23433,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_via.c= linux-2.6.32.38/drivers/ata/sa .inherits =3D &svia_base_ops, .hardreset =3D sata_std_hardreset, .scr_read =3D vt8251_scr_read, -diff -urNp linux-2.6.32.38/drivers/ata/sata_vsc.c linux-2.6.32.38/driver= s/ata/sata_vsc.c ---- linux-2.6.32.38/drivers/ata/sata_vsc.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/ata/sata_vsc.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/ata/sata_vsc.c linux-2.6.32.39/driver= s/ata/sata_vsc.c +--- linux-2.6.32.39/drivers/ata/sata_vsc.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/ata/sata_vsc.c 2011-04-17 15:56:46.000000000= -0400 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; =20 @@ -23715,9 +23445,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_vsc.c= linux-2.6.32.38/drivers/ata/sa .inherits =3D &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.32.38/drivers/atm/adummy.c linux-2.6.32.38/drivers/= atm/adummy.c ---- linux-2.6.32.38/drivers/atm/adummy.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/atm/adummy.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/atm/adummy.c linux-2.6.32.39/drivers/= atm/adummy.c +--- linux-2.6.32.39/drivers/atm/adummy.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/atm/adummy.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct=20 vcc->pop(vcc, skb); else @@ -23727,9 +23457,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/adummy.c l= inux-2.6.32.38/drivers/atm/adum =20 return 0; } -diff -urNp linux-2.6.32.38/drivers/atm/ambassador.c linux-2.6.32.38/driv= ers/atm/ambassador.c ---- linux-2.6.32.38/drivers/atm/ambassador.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/atm/ambassador.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/atm/ambassador.c linux-2.6.32.39/driv= ers/atm/ambassador.c +--- linux-2.6.32.39/drivers/atm/ambassador.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/atm/ambassador.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,=20 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); =20 @@ -23766,9 +23496,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/ambassador= .c linux-2.6.32.38/drivers/atm/ return -ENOMEM; // ? } =20 -diff -urNp linux-2.6.32.38/drivers/atm/atmtcp.c linux-2.6.32.38/drivers/= atm/atmtcp.c ---- linux-2.6.32.38/drivers/atm/atmtcp.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/atm/atmtcp.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/atm/atmtcp.c linux-2.6.32.39/drivers/= atm/atmtcp.c +--- linux-2.6.32.39/drivers/atm/atmtcp.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/atm/atmtcp.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc=20 if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -23818,9 +23548,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/atmtcp.c l= inux-2.6.32.38/drivers/atm/atmt done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.32.38/drivers/atm/eni.c linux-2.6.32.38/drivers/atm= /eni.c ---- linux-2.6.32.38/drivers/atm/eni.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/drivers/atm/eni.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/drivers/atm/eni.c linux-2.6.32.39/drivers/atm= /eni.c +--- linux-2.6.32.39/drivers/atm/eni.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/drivers/atm/eni.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -23866,9 +23596,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/eni.c linu= x-2.6.32.38/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.32.38/drivers/atm/firestream.c linux-2.6.32.38/driv= ers/atm/firestream.c ---- linux-2.6.32.38/drivers/atm/firestream.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/atm/firestream.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/atm/firestream.c linux-2.6.32.39/driv= ers/atm/firestream.c +--- linux-2.6.32.39/drivers/atm/firestream.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/atm/firestream.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -23902,9 +23632,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/firestream= .c linux-2.6.32.38/drivers/atm/ break; default: /* Hmm. Haven't written the code to handle the others yet...= -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n= ",=20 -diff -urNp linux-2.6.32.38/drivers/atm/fore200e.c linux-2.6.32.38/driver= s/atm/fore200e.c ---- linux-2.6.32.38/drivers/atm/fore200e.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/atm/fore200e.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/atm/fore200e.c linux-2.6.32.39/driver= s/atm/fore200e.c +--- linux-2.6.32.39/drivers/atm/fore200e.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/atm/fore200e.c 2011-04-17 15:56:46.000000000= -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -23961,9 +23691,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/fore200e.c= linux-2.6.32.38/drivers/atm/fo =20 fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - hear= tbeat is %08x\n", -diff -urNp linux-2.6.32.38/drivers/atm/he.c linux-2.6.32.38/drivers/atm/= he.c ---- linux-2.6.32.38/drivers/atm/he.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/atm/he.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/atm/he.c linux-2.6.32.39/drivers/atm/= he.c +--- linux-2.6.32.39/drivers/atm/he.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/atm/he.c 2011-04-17 15:56:46.000000000 -0400 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i =20 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -24045,9 +23775,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/he.c linux= -2.6.32.38/drivers/atm/he.c =20 return 0; } -diff -urNp linux-2.6.32.38/drivers/atm/horizon.c linux-2.6.32.38/drivers= /atm/horizon.c ---- linux-2.6.32.38/drivers/atm/horizon.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/atm/horizon.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/atm/horizon.c linux-2.6.32.39/drivers= /atm/horizon.c +--- linux-2.6.32.39/drivers/atm/horizon.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/atm/horizon.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,=20 { struct atm_vcc * vcc =3D ATM_SKB(skb)->vcc; @@ -24066,9 +23796,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/horizon.c = linux-2.6.32.38/drivers/atm/hor =09 // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.32.38/drivers/atm/idt77252.c linux-2.6.32.38/driver= s/atm/idt77252.c ---- linux-2.6.32.38/drivers/atm/idt77252.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/atm/idt77252.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/atm/idt77252.c linux-2.6.32.39/driver= s/atm/idt77252.c +--- linux-2.6.32.39/drivers/atm/idt77252.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/atm/idt77252.c 2011-04-17 15:56:46.000000000= -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -24223,9 +23953,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/idt77252.c= linux-2.6.32.38/drivers/atm/id return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.32.38/drivers/atm/iphase.c linux-2.6.32.38/drivers/= atm/iphase.c ---- linux-2.6.32.38/drivers/atm/iphase.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/atm/iphase.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/atm/iphase.c linux-2.6.32.39/drivers/= atm/iphase.c +--- linux-2.6.32.39/drivers/atm/iphase.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/atm/iphase.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) =20 status =3D (u_short) (buf_desc_ptr->desc_mode); =20 if (status & (RX_CER | RX_PTE | RX_OFL)) =20 @@ -24322,9 +24052,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/iphase.c l= inux-2.6.32.38/drivers/atm/ipha if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota =3D vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota =3D %d \n", (u32)vcc->tx_quota = ); -diff -urNp linux-2.6.32.38/drivers/atm/lanai.c linux-2.6.32.38/drivers/a= tm/lanai.c ---- linux-2.6.32.38/drivers/atm/lanai.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/drivers/atm/lanai.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/drivers/atm/lanai.c linux-2.6.32.39/drivers/a= tm/lanai.c +--- linux-2.6.32.39/drivers/atm/lanai.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/drivers/atm/lanai.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -24379,9 +24109,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/lanai.c li= nux-2.6.32.38/drivers/atm/lanai lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr =3D &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.32.38/drivers/atm/nicstar.c linux-2.6.32.38/drivers= /atm/nicstar.c ---- linux-2.6.32.38/drivers/atm/nicstar.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/atm/nicstar.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/atm/nicstar.c linux-2.6.32.39/drivers= /atm/nicstar.c +--- linux-2.6.32.39/drivers/atm/nicstar.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/atm/nicstar.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,=20 if ((vc =3D (vc_map *) vcc->dev_data) =3D=3D NULL) { @@ -24584,9 +24314,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/nicstar.c = linux-2.6.32.38/drivers/atm/nic } } =20 -diff -urNp linux-2.6.32.38/drivers/atm/solos-pci.c linux-2.6.32.38/drive= rs/atm/solos-pci.c ---- linux-2.6.32.38/drivers/atm/solos-pci.c 2011-04-17 17:00:52.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/atm/solos-pci.c 2011-04-17 17:03:05.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/atm/solos-pci.c linux-2.6.32.39/drive= rs/atm/solos-pci.c +--- linux-2.6.32.39/drivers/atm/solos-pci.c 2011-04-17 17:00:52.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/atm/solos-pci.c 2011-04-17 17:03:05.00000000= 0 -0400 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -24605,9 +24335,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/solos-pci.= c linux-2.6.32.38/drivers/atm/s solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.32.38/drivers/atm/suni.c linux-2.6.32.38/drivers/at= m/suni.c ---- linux-2.6.32.38/drivers/atm/suni.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/atm/suni.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/atm/suni.c linux-2.6.32.39/drivers/at= m/suni.c +--- linux-2.6.32.39/drivers/atm/suni.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/atm/suni.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); =20 =20 @@ -24619,9 +24349,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/suni.c lin= ux-2.6.32.38/drivers/atm/suni.c =20 =20 static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.32.38/drivers/atm/uPD98402.c linux-2.6.32.38/driver= s/atm/uPD98402.c ---- linux-2.6.32.38/drivers/atm/uPD98402.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/atm/uPD98402.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/atm/uPD98402.c linux-2.6.32.39/driver= s/atm/uPD98402.c +--- linux-2.6.32.39/drivers/atm/uPD98402.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/atm/uPD98402.c 2011-04-17 15:56:46.000000000= -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error =3D 0; @@ -24666,9 +24396,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/uPD98402.c= linux-2.6.32.38/drivers/atm/uP return 0; } =20 -diff -urNp linux-2.6.32.38/drivers/atm/zatm.c linux-2.6.32.38/drivers/at= m/zatm.c ---- linux-2.6.32.38/drivers/atm/zatm.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/atm/zatm.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/atm/zatm.c linux-2.6.32.39/drivers/at= m/zatm.c +--- linux-2.6.32.39/drivers/atm/zatm.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/atm/zatm.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -24696,9 +24426,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/zatm.c lin= ux-2.6.32.38/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } =20 -diff -urNp linux-2.6.32.38/drivers/base/bus.c linux-2.6.32.38/drivers/ba= se/bus.c ---- linux-2.6.32.38/drivers/base/bus.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/base/bus.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/base/bus.c linux-2.6.32.39/drivers/ba= se/bus.c +--- linux-2.6.32.39/drivers/base/bus.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/base/bus.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -24726,9 +24456,9 @@ diff -urNp linux-2.6.32.38/drivers/base/bus.c lin= ux-2.6.32.38/drivers/base/bus.c .filter =3D bus_uevent_filter, }; =20 -diff -urNp linux-2.6.32.38/drivers/base/class.c linux-2.6.32.38/drivers/= base/class.c ---- linux-2.6.32.38/drivers/base/class.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/base/class.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/base/class.c linux-2.6.32.39/drivers/= base/class.c +--- linux-2.6.32.39/drivers/base/class.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/base/class.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -63,7 +63,7 @@ static void class_release(struct kobject kfree(cp); } @@ -24738,9 +24468,9 @@ diff -urNp linux-2.6.32.38/drivers/base/class.c l= inux-2.6.32.38/drivers/base/cla .show =3D class_attr_show, .store =3D class_attr_store, }; -diff -urNp linux-2.6.32.38/drivers/base/core.c linux-2.6.32.38/drivers/b= ase/core.c ---- linux-2.6.32.38/drivers/base/core.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/drivers/base/core.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/drivers/base/core.c linux-2.6.32.39/drivers/b= ase/core.c +--- linux-2.6.32.39/drivers/base/core.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/drivers/base/core.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -24759,9 +24489,9 @@ diff -urNp linux-2.6.32.38/drivers/base/core.c li= nux-2.6.32.38/drivers/base/core .filter =3D dev_uevent_filter, .name =3D dev_uevent_name, .uevent =3D dev_uevent, -diff -urNp linux-2.6.32.38/drivers/base/memory.c linux-2.6.32.38/drivers= /base/memory.c ---- linux-2.6.32.38/drivers/base/memory.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/base/memory.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/base/memory.c linux-2.6.32.39/drivers= /base/memory.c +--- linux-2.6.32.39/drivers/base/memory.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/base/memory.c 2011-04-17 15:56:46.000000000 = -0400 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -24771,9 +24501,9 @@ diff -urNp linux-2.6.32.38/drivers/base/memory.c = linux-2.6.32.38/drivers/base/me .name =3D memory_uevent_name, .uevent =3D memory_uevent, }; -diff -urNp linux-2.6.32.38/drivers/base/sys.c linux-2.6.32.38/drivers/ba= se/sys.c ---- linux-2.6.32.38/drivers/base/sys.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/base/sys.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/base/sys.c linux-2.6.32.39/drivers/ba= se/sys.c +--- linux-2.6.32.39/drivers/base/sys.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/base/sys.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -24792,9 +24522,9 @@ diff -urNp linux-2.6.32.38/drivers/base/sys.c lin= ux-2.6.32.38/drivers/base/sys.c .show =3D sysdev_class_show, .store =3D sysdev_class_store, }; -diff -urNp linux-2.6.32.38/drivers/block/cciss.c linux-2.6.32.38/drivers= /block/cciss.c ---- linux-2.6.32.38/drivers/block/cciss.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/block/cciss.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/block/cciss.c linux-2.6.32.39/drivers= /block/cciss.c +--- linux-2.6.32.39/drivers/block/cciss.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/block/cciss.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct int err; u32 cp; @@ -24804,9 +24534,9 @@ diff -urNp linux-2.6.32.38/drivers/block/cciss.c = linux-2.6.32.38/drivers/block/c err =3D 0; err |=3D copy_from_user(&arg64.LUN_info, &arg32->LUN_info, -diff -urNp linux-2.6.32.38/drivers/block/pktcdvd.c linux-2.6.32.38/drive= rs/block/pktcdvd.c ---- linux-2.6.32.38/drivers/block/pktcdvd.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/block/pktcdvd.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/block/pktcdvd.c linux-2.6.32.39/drive= rs/block/pktcdvd.c +--- linux-2.6.32.39/drivers/block/pktcdvd.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/block/pktcdvd.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -24816,9 +24546,9 @@ diff -urNp linux-2.6.32.38/drivers/block/pktcdvd.= c linux-2.6.32.38/drivers/block .show =3D kobj_pkt_show, .store =3D kobj_pkt_store }; -diff -urNp linux-2.6.32.38/drivers/char/agp/frontend.c linux-2.6.32.38/d= rivers/char/agp/frontend.c ---- linux-2.6.32.38/drivers/char/agp/frontend.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/char/agp/frontend.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/agp/frontend.c linux-2.6.32.39/d= rivers/char/agp/frontend.c +--- linux-2.6.32.39/drivers/char/agp/frontend.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/char/agp/frontend.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -24828,21 +24558,70 @@ diff -urNp linux-2.6.32.38/drivers/char/agp/fro= ntend.c linux-2.6.32.38/drivers/c return -EFAULT; =20 client =3D agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.32.38/drivers/char/agp/intel-agp.c linux-2.6.32.38/= drivers/char/agp/intel-agp.c ---- linux-2.6.32.38/drivers/char/agp/intel-agp.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/char/agp/intel-agp.c 2011-04-17 15:56:46.000= 000000 -0400 -@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc - ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), - ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), - ID(PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB), -- { } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.32.38/drivers/char/briq_panel.c linux-2.6.32.38/dri= vers/char/briq_panel.c ---- linux-2.6.32.38/drivers/char/briq_panel.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/char/briq_panel.c 2011-04-18 19:48:57.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/agp/generic.c linux-2.6.32.39/dr= ivers/char/agp/generic.c +--- linux-2.6.32.39/drivers/char/agp/generic.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/char/agp/generic.c 2011-04-22 19:37:29.00000= 0000 -0400 +@@ -123,6 +123,9 @@ static struct agp_memory *agp_create_use + struct agp_memory *new; + unsigned long alloc_size =3D num_agp_pages*sizeof(struct page *); +=20 ++ if (INT_MAX/sizeof(struct page *) < num_agp_pages) ++ return NULL; ++ + new =3D kzalloc(sizeof(struct agp_memory), GFP_KERNEL); + if (new =3D=3D NULL) + return NULL; +@@ -242,11 +245,14 @@ struct agp_memory *agp_allocate_memory(s + int scratch_pages; + struct agp_memory *new; + size_t i; ++ int cur_memory; +=20 + if (!bridge) + return NULL; +=20 +- if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->= max_memory_agp) ++ cur_memory =3D atomic_read(&bridge->current_memory_agp); ++ if ((cur_memory + page_count > bridge->max_memory_agp) || ++ (cur_memory + page_count < page_count)) + return NULL; +=20 + if (type >=3D AGP_USER_TYPES) { +@@ -1123,8 +1129,8 @@ int agp_generic_insert_memory(struct agp + return -EINVAL; + } +=20 +- /* AK: could wrap */ +- if ((pg_start + mem->page_count) > num_entries) ++ if (((pg_start + mem->page_count) > num_entries) || ++ ((pg_start + mem->page_count) < pg_start)) + return -EINVAL; +=20 + j =3D pg_start; +@@ -1158,7 +1164,7 @@ int agp_generic_remove_memory(struct agp + { + size_t i; + struct agp_bridge_data *bridge; +- int mask_type; ++ int mask_type, num_entries; +=20 + bridge =3D mem->bridge; + if (!bridge) +@@ -1170,6 +1176,11 @@ int agp_generic_remove_memory(struct agp + if (type !=3D mem->type) + return -EINVAL; +=20 ++ num_entries =3D agp_num_entries(); ++ if (((pg_start + mem->page_count) > num_entries) || ++ ((pg_start + mem->page_count) < pg_start)) ++ return -EINVAL; ++ + mask_type =3D bridge->driver->agp_type_to_mask_type(bridge, type); + if (mask_type !=3D 0) { + /* The generic routines know nothing of memory types */ +diff -urNp linux-2.6.32.39/drivers/char/briq_panel.c linux-2.6.32.39/dri= vers/char/briq_panel.c +--- linux-2.6.32.39/drivers/char/briq_panel.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/char/briq_panel.c 2011-04-18 19:48:57.000000= 000 -0400 @@ -10,6 +10,7 @@ #include #include @@ -24884,9 +24663,9 @@ diff -urNp linux-2.6.32.38/drivers/char/briq_pane= l.c linux-2.6.32.38/drivers/cha =20 return len; } -diff -urNp linux-2.6.32.38/drivers/char/genrtc.c linux-2.6.32.38/drivers= /char/genrtc.c ---- linux-2.6.32.38/drivers/char/genrtc.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/char/genrtc.c 2011-04-18 19:45:42.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/char/genrtc.c linux-2.6.32.39/drivers= /char/genrtc.c +--- linux-2.6.32.39/drivers/char/genrtc.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/char/genrtc.c 2011-04-18 19:45:42.000000000 = -0400 @@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *i switch (cmd) { =20 @@ -24895,9 +24674,9 @@ diff -urNp linux-2.6.32.38/drivers/char/genrtc.c = linux-2.6.32.38/drivers/char/ge if (get_rtc_pll(&pll)) return -EINVAL; else -diff -urNp linux-2.6.32.38/drivers/char/hpet.c linux-2.6.32.38/drivers/c= har/hpet.c ---- linux-2.6.32.38/drivers/char/hpet.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/drivers/char/hpet.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/drivers/char/hpet.c linux-2.6.32.39/drivers/c= har/hpet.c +--- linux-2.6.32.39/drivers/char/hpet.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/drivers/char/hpet.c 2011-04-23 12:56:11.000000000 -0= 400 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in return 0; } @@ -24930,18 +24709,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hpet.c l= inux-2.6.32.38/drivers/char/hpet info.hi_flags =3D readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK; info.hi_hpet =3D hpetp->hp_which; -@@ -1015,7 +1015,7 @@ static struct acpi_driver hpet_acpi_driv - }, - }; -=20 --static struct miscdevice hpet_misc =3D { HPET_MINOR, "hpet", &hpet_fops= }; -+static struct miscdevice hpet_misc =3D { HPET_MINOR, "hpet", &hpet_fops= , {NULL, NULL}, NULL, NULL }; -=20 - static int __init hpet_init(void) - { -diff -urNp linux-2.6.32.38/drivers/char/hvc_beat.c linux-2.6.32.38/drive= rs/char/hvc_beat.c ---- linux-2.6.32.38/drivers/char/hvc_beat.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/char/hvc_beat.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_beat.c linux-2.6.32.39/drive= rs/char/hvc_beat.c +--- linux-2.6.32.39/drivers/char/hvc_beat.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/char/hvc_beat.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -24951,9 +24721,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_beat.= c linux-2.6.32.38/drivers/char/ .get_chars =3D hvc_beat_get_chars, .put_chars =3D hvc_beat_put_chars, }; -diff -urNp linux-2.6.32.38/drivers/char/hvc_console.c linux-2.6.32.38/dr= ivers/char/hvc_console.c ---- linux-2.6.32.38/drivers/char/hvc_console.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/char/hvc_console.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_console.c linux-2.6.32.39/dr= ivers/char/hvc_console.c +--- linux-2.6.32.39/drivers/char/hvc_console.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/char/hvc_console.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind * console interfaces but can still be used as a tty device. This has = to be * static because kmalloc will not work during early console init. @@ -24981,9 +24751,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_conso= le.c linux-2.6.32.38/drivers/ch { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.32.38/drivers/char/hvc_console.h linux-2.6.32.38/dr= ivers/char/hvc_console.h ---- linux-2.6.32.38/drivers/char/hvc_console.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/char/hvc_console.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_console.h linux-2.6.32.39/dr= ivers/char/hvc_console.h +--- linux-2.6.32.39/drivers/char/hvc_console.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/char/hvc_console.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; @@ -25007,9 +24777,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_conso= le.h linux-2.6.32.38/drivers/ch /* remove a vterm from hvc tty operation (module_exit or hotplug remove= ) */ extern int hvc_remove(struct hvc_struct *hp); =20 -diff -urNp linux-2.6.32.38/drivers/char/hvc_iseries.c linux-2.6.32.38/dr= ivers/char/hvc_iseries.c ---- linux-2.6.32.38/drivers/char/hvc_iseries.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/char/hvc_iseries.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_iseries.c linux-2.6.32.39/dr= ivers/char/hvc_iseries.c +--- linux-2.6.32.39/drivers/char/hvc_iseries.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/char/hvc_iseries.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -197,7 +197,7 @@ done: return sent; } @@ -25019,9 +24789,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_iseri= es.c linux-2.6.32.38/drivers/ch .get_chars =3D get_chars, .put_chars =3D put_chars, .notifier_add =3D notifier_add_irq, -diff -urNp linux-2.6.32.38/drivers/char/hvc_iucv.c linux-2.6.32.38/drive= rs/char/hvc_iucv.c ---- linux-2.6.32.38/drivers/char/hvc_iucv.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/char/hvc_iucv.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_iucv.c linux-2.6.32.39/drive= rs/char/hvc_iucv.c +--- linux-2.6.32.39/drivers/char/hvc_iucv.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/char/hvc_iucv.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru =20 =20 @@ -25031,9 +24801,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_iucv.= c linux-2.6.32.38/drivers/char/ .get_chars =3D hvc_iucv_get_chars, .put_chars =3D hvc_iucv_put_chars, .notifier_add =3D hvc_iucv_notifier_add, -diff -urNp linux-2.6.32.38/drivers/char/hvc_rtas.c linux-2.6.32.38/drive= rs/char/hvc_rtas.c ---- linux-2.6.32.38/drivers/char/hvc_rtas.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/char/hvc_rtas.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_rtas.c linux-2.6.32.39/drive= rs/char/hvc_rtas.c +--- linux-2.6.32.39/drivers/char/hvc_rtas.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/char/hvc_rtas.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -25043,9 +24813,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_rtas.= c linux-2.6.32.38/drivers/char/ .get_chars =3D hvc_rtas_read_console, .put_chars =3D hvc_rtas_write_console, }; -diff -urNp linux-2.6.32.38/drivers/char/hvcs.c linux-2.6.32.38/drivers/c= har/hvcs.c ---- linux-2.6.32.38/drivers/char/hvcs.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/drivers/char/hvcs.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/drivers/char/hvcs.c linux-2.6.32.39/drivers/c= har/hvcs.c +--- linux-2.6.32.39/drivers/char/hvcs.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/drivers/char/hvcs.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -82,6 +82,7 @@ #include #include @@ -25148,9 +24918,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvcs.c li= nux-2.6.32.38/drivers/char/hvcs return 0; =20 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.32.38/drivers/char/hvc_udbg.c linux-2.6.32.38/drive= rs/char/hvc_udbg.c ---- linux-2.6.32.38/drivers/char/hvc_udbg.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/char/hvc_udbg.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_udbg.c linux-2.6.32.39/drive= rs/char/hvc_udbg.c +--- linux-2.6.32.39/drivers/char/hvc_udbg.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/char/hvc_udbg.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -25160,9 +24930,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_udbg.= c linux-2.6.32.38/drivers/char/ .get_chars =3D hvc_udbg_get, .put_chars =3D hvc_udbg_put, }; -diff -urNp linux-2.6.32.38/drivers/char/hvc_vio.c linux-2.6.32.38/driver= s/char/hvc_vio.c ---- linux-2.6.32.38/drivers/char/hvc_vio.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/char/hvc_vio.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_vio.c linux-2.6.32.39/driver= s/char/hvc_vio.c +--- linux-2.6.32.39/drivers/char/hvc_vio.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/char/hvc_vio.c 2011-04-17 15:56:46.000000000= -0400 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -25172,9 +24942,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_vio.c= linux-2.6.32.38/drivers/char/h .get_chars =3D filtered_get_chars, .put_chars =3D hvc_put_chars, .notifier_add =3D notifier_add_irq, -diff -urNp linux-2.6.32.38/drivers/char/hvc_xen.c linux-2.6.32.38/driver= s/char/hvc_xen.c ---- linux-2.6.32.38/drivers/char/hvc_xen.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/char/hvc_xen.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/char/hvc_xen.c linux-2.6.32.39/driver= s/char/hvc_xen.c +--- linux-2.6.32.39/drivers/char/hvc_xen.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/char/hvc_xen.c 2011-04-17 15:56:46.000000000= -0400 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -25184,9 +24954,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_xen.c= linux-2.6.32.38/drivers/char/h .get_chars =3D read_console, .put_chars =3D write_console, .notifier_add =3D notifier_add_irq, -diff -urNp linux-2.6.32.38/drivers/char/ipmi/ipmi_msghandler.c linux-2.6= .32.38/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.32.38/drivers/char/ipmi/ipmi_msghandler.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/char/ipmi/ipmi_msghandler.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c linux-2.6= .32.39/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c 2011-04-17 15:56= :46.000000000 -0400 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -25217,9 +24987,9 @@ diff -urNp linux-2.6.32.38/drivers/char/ipmi/ipmi= _msghandler.c linux-2.6.32.38/d =20 intf->proc_dir =3D NULL; =20 -diff -urNp linux-2.6.32.38/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32= .38/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.32.38/drivers/char/ipmi/ipmi_si_intf.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32= .39/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:56:46= .000000000 -0400 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; =20 @@ -25250,9 +25020,9 @@ diff -urNp linux-2.6.32.38/drivers/char/ipmi/ipmi= _si_intf.c linux-2.6.32.38/driv =20 new_smi->interrupt_disabled =3D 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.32.38/drivers/char/istallion.c linux-2.6.32.38/driv= ers/char/istallion.c ---- linux-2.6.32.38/drivers/char/istallion.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/char/istallion.c 2011-04-18 19:39:36.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/char/istallion.c linux-2.6.32.39/driv= ers/char/istallion.c +--- linux-2.6.32.39/drivers/char/istallion.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/char/istallion.c 2011-04-22 22:18:05.0000000= 00 -0400 @@ -187,7 +187,6 @@ static struct ktermios stli_deftermios=20 * re-used for each stats call. */ @@ -25265,13 +25035,13 @@ diff -urNp linux-2.6.32.38/drivers/char/istalli= on.c linux-2.6.32.38/drivers/char { struct stlibrd *brdp; unsigned int i; -+ combrd_t stdli_brdstats; ++ combrd_t stli_brdstats; =20 if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) return -EFAULT; -diff -urNp linux-2.6.32.38/drivers/char/Kconfig linux-2.6.32.38/drivers/= char/Kconfig ---- linux-2.6.32.38/drivers/char/Kconfig 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/char/Kconfig 2011-04-18 19:20:15.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/char/Kconfig linux-2.6.32.39/drivers/= char/Kconfig +--- linux-2.6.32.39/drivers/char/Kconfig 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/char/Kconfig 2011-04-18 19:20:15.000000000 -= 0400 @@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING =20 config DEVKMEM @@ -25290,9 +25060,9 @@ diff -urNp linux-2.6.32.38/drivers/char/Kconfig l= inux-2.6.32.38/drivers/char/Kco default y =20 source "drivers/s390/char/Kconfig" -diff -urNp linux-2.6.32.38/drivers/char/keyboard.c linux-2.6.32.38/drive= rs/char/keyboard.c ---- linux-2.6.32.38/drivers/char/keyboard.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/char/keyboard.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/char/keyboard.c linux-2.6.32.39/drive= rs/char/keyboard.c +--- linux-2.6.32.39/drivers/char/keyboard.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/char/keyboard.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode =3D=3D VC_MEDIUMRAW) && value !=3D KVAL(K_SAK)) @@ -25319,9 +25089,9 @@ diff -urNp linux-2.6.32.38/drivers/char/keyboard.= c linux-2.6.32.38/drivers/char/ }; =20 MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.32.38/drivers/char/mem.c linux-2.6.32.38/drivers/ch= ar/mem.c ---- linux-2.6.32.38/drivers/char/mem.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/char/mem.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/char/mem.c linux-2.6.32.39/drivers/ch= ar/mem.c +--- linux-2.6.32.39/drivers/char/mem.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/char/mem.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -18,6 +18,7 @@ #include #include @@ -25463,24 +25233,9 @@ diff -urNp linux-2.6.32.38/drivers/char/mem.c li= nux-2.6.32.38/drivers/char/mem.c }; =20 static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.32.38/drivers/char/nvram.c linux-2.6.32.38/drivers/= char/nvram.c ---- linux-2.6.32.38/drivers/char/nvram.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/char/nvram.c 2011-04-17 15:56:46.000000000 -= 0400 -@@ -435,7 +435,10 @@ static const struct file_operations nvra - static struct miscdevice nvram_dev =3D { - NVRAM_MINOR, - "nvram", -- &nvram_fops -+ &nvram_fops, -+ {NULL, NULL}, -+ NULL, -+ NULL - }; -=20 - static int __init nvram_init(void) -diff -urNp linux-2.6.32.38/drivers/char/pcmcia/ipwireless/tty.c linux-2.= 6.32.38/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.32.38/drivers/char/pcmcia/ipwireless/tty.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c linux-2.= 6.32.39/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -29,6 +29,7 @@ #include #include @@ -25603,9 +25358,9 @@ diff -urNp linux-2.6.32.38/drivers/char/pcmcia/ip= wireless/tty.c linux-2.6.32.38/ do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.32.38/drivers/char/pty.c linux-2.6.32.38/drivers/ch= ar/pty.c ---- linux-2.6.32.38/drivers/char/pty.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/char/pty.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/char/pty.c linux-2.6.32.39/drivers/ch= ar/pty.c +--- linux-2.6.32.39/drivers/char/pty.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/char/pty.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode return ret; } @@ -25636,9 +25391,9 @@ diff -urNp linux-2.6.32.38/drivers/char/pty.c lin= ux-2.6.32.38/drivers/char/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0= ) -diff -urNp linux-2.6.32.38/drivers/char/random.c linux-2.6.32.38/drivers= /char/random.c ---- linux-2.6.32.38/drivers/char/random.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/char/random.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/char/random.c linux-2.6.32.39/drivers= /char/random.c +--- linux-2.6.32.39/drivers/char/random.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/char/random.c 2011-04-17 15:56:46.000000000 = -0400 @@ -254,8 +254,13 @@ /* * Configuration information @@ -25680,9 +25435,9 @@ diff -urNp linux-2.6.32.38/drivers/char/random.c = linux-2.6.32.38/drivers/char/ra static int max_write_thresh =3D INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; =20 -diff -urNp linux-2.6.32.38/drivers/char/sonypi.c linux-2.6.32.38/drivers= /char/sonypi.c ---- linux-2.6.32.38/drivers/char/sonypi.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/char/sonypi.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/char/sonypi.c linux-2.6.32.39/drivers= /char/sonypi.c +--- linux-2.6.32.39/drivers/char/sonypi.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/char/sonypi.c 2011-04-17 15:56:46.000000000 = -0400 @@ -55,6 +55,7 @@ #include #include @@ -25721,9 +25476,9 @@ diff -urNp linux-2.6.32.38/drivers/char/sonypi.c = linux-2.6.32.38/drivers/char/so mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.32.38/drivers/char/tpm/tpm_bios.c linux-2.6.32.38/d= rivers/char/tpm/tpm_bios.c ---- linux-2.6.32.38/drivers/char/tpm/tpm_bios.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/char/tpm/tpm_bios.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/tpm/tpm_bios.c linux-2.6.32.39/d= rivers/char/tpm/tpm_bios.c +--- linux-2.6.32.39/drivers/char/tpm/tpm_bios.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/char/tpm/tpm_bios.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event =3D addr; =20 @@ -25764,9 +25519,9 @@ diff -urNp linux-2.6.32.38/drivers/char/tpm/tpm_b= ios.c linux-2.6.32.38/drivers/c =20 memcpy(log->bios_event_log, virt, len); =20 -diff -urNp linux-2.6.32.38/drivers/char/tpm/tpm.c linux-2.6.32.38/driver= s/char/tpm/tpm.c ---- linux-2.6.32.38/drivers/char/tpm/tpm.c 2011-04-17 17:00:52.000000000= -0400 -+++ linux-2.6.32.38/drivers/char/tpm/tpm.c 2011-04-17 17:03:05.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/char/tpm/tpm.c linux-2.6.32.39/driver= s/char/tpm/tpm.c +--- linux-2.6.32.39/drivers/char/tpm/tpm.c 2011-04-17 17:00:52.000000000= -0400 ++++ linux-2.6.32.39/drivers/char/tpm/tpm.c 2011-04-17 17:03:05.000000000= -0400 @@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c chip->vendor.req_complete_val) goto out_recv; @@ -25776,9 +25531,9 @@ diff -urNp linux-2.6.32.38/drivers/char/tpm/tpm.c= linux-2.6.32.38/drivers/char/t dev_err(chip->dev, "Operation Canceled\n"); rc =3D -ECANCELED; goto out; -diff -urNp linux-2.6.32.38/drivers/char/tty_io.c linux-2.6.32.38/drivers= /char/tty_io.c ---- linux-2.6.32.38/drivers/char/tty_io.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/char/tty_io.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/char/tty_io.c linux-2.6.32.39/drivers= /char/tty_io.c +--- linux-2.6.32.39/drivers/char/tty_io.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/char/tty_io.c 2011-04-17 15:56:46.000000000 = -0400 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); EXPORT_SYMBOL(tty_mutex); @@ -25917,9 +25672,9 @@ diff -urNp linux-2.6.32.38/drivers/char/tty_io.c = linux-2.6.32.38/drivers/char/tt /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. -diff -urNp linux-2.6.32.38/drivers/char/tty_ldisc.c linux-2.6.32.38/driv= ers/char/tty_ldisc.c ---- linux-2.6.32.38/drivers/char/tty_ldisc.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/char/tty_ldisc.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/char/tty_ldisc.c linux-2.6.32.39/driv= ers/char/tty_ldisc.c +--- linux-2.6.32.39/drivers/char/tty_ldisc.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/char/tty_ldisc.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc * if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo =3D ld->ops; @@ -25965,9 +25720,9 @@ diff -urNp linux-2.6.32.38/drivers/char/tty_ldisc= .c linux-2.6.32.38/drivers/char module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.32.38/drivers/char/virtio_console.c linux-2.6.32.38= /drivers/char/virtio_console.c ---- linux-2.6.32.38/drivers/char/virtio_console.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/char/virtio_console.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/char/virtio_console.c linux-2.6.32.39= /drivers/char/virtio_console.c +--- linux-2.6.32.39/drivers/char/virtio_console.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/char/virtio_console.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -44,6 +44,7 @@ static unsigned int in_len; static char *in, *inbuf; =20 @@ -25976,9 +25731,9 @@ diff -urNp linux-2.6.32.38/drivers/char/virtio_co= nsole.c linux-2.6.32.38/drivers static struct hv_ops virtio_cons; =20 /* The hvc device */ -diff -urNp linux-2.6.32.38/drivers/char/vt.c linux-2.6.32.38/drivers/cha= r/vt.c ---- linux-2.6.32.38/drivers/char/vt.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/drivers/char/vt.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/drivers/char/vt.c linux-2.6.32.39/drivers/cha= r/vt.c +--- linux-2.6.32.39/drivers/char/vt.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/drivers/char/vt.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier =20 static void notify_write(struct vc_data *vc, unsigned int unicode) @@ -25988,9 +25743,9 @@ diff -urNp linux-2.6.32.38/drivers/char/vt.c linu= x-2.6.32.38/drivers/char/vt.c atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); } =20 -diff -urNp linux-2.6.32.38/drivers/char/vt_ioctl.c linux-2.6.32.38/drive= rs/char/vt_ioctl.c ---- linux-2.6.32.38/drivers/char/vt_ioctl.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/char/vt_ioctl.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/char/vt_ioctl.c linux-2.6.32.39/drive= rs/char/vt_ioctl.c +--- linux-2.6.32.39/drivers/char/vt_ioctl.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/char/vt_ioctl.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -26034,9 +25789,9 @@ diff -urNp linux-2.6.32.38/drivers/char/vt_ioctl.= c linux-2.6.32.38/drivers/char/ if (!perm) { ret =3D -EPERM; goto reterr; -diff -urNp linux-2.6.32.38/drivers/cpufreq/cpufreq.c linux-2.6.32.38/dri= vers/cpufreq/cpufreq.c ---- linux-2.6.32.38/drivers/cpufreq/cpufreq.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/cpufreq/cpufreq.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/cpufreq/cpufreq.c linux-2.6.32.39/dri= vers/cpufreq/cpufreq.c +--- linux-2.6.32.39/drivers/cpufreq/cpufreq.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/cpufreq/cpufreq.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -26046,9 +25801,9 @@ diff -urNp linux-2.6.32.38/drivers/cpufreq/cpufre= q.c linux-2.6.32.38/drivers/cpu .show =3D show, .store =3D store, }; -diff -urNp linux-2.6.32.38/drivers/cpuidle/sysfs.c linux-2.6.32.38/drive= rs/cpuidle/sysfs.c ---- linux-2.6.32.38/drivers/cpuidle/sysfs.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/cpuidle/sysfs.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/cpuidle/sysfs.c linux-2.6.32.39/drive= rs/cpuidle/sysfs.c +--- linux-2.6.32.39/drivers/cpuidle/sysfs.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/cpuidle/sysfs.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -26076,9 +25831,9 @@ diff -urNp linux-2.6.32.38/drivers/cpuidle/sysfs.= c linux-2.6.32.38/drivers/cpuid { kobject_put(&device->kobjs[i]->kobj); wait_for_completion(&device->kobjs[i]->kobj_unregister); -diff -urNp linux-2.6.32.38/drivers/dma/ioat/dma.c linux-2.6.32.38/driver= s/dma/ioat/dma.c ---- linux-2.6.32.38/drivers/dma/ioat/dma.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/dma/ioat/dma.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/dma/ioat/dma.c linux-2.6.32.39/driver= s/dma/ioat/dma.c +--- linux-2.6.32.39/drivers/dma/ioat/dma.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/dma/ioat/dma.c 2011-04-17 15:56:46.000000000= -0400 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str return entry->show(&chan->common, page); } @@ -26088,9 +25843,9 @@ diff -urNp linux-2.6.32.38/drivers/dma/ioat/dma.c= linux-2.6.32.38/drivers/dma/io .show =3D ioat_attr_show, }; =20 -diff -urNp linux-2.6.32.38/drivers/dma/ioat/dma.h linux-2.6.32.38/driver= s/dma/ioat/dma.h ---- linux-2.6.32.38/drivers/dma/ioat/dma.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/dma/ioat/dma.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/dma/ioat/dma.h linux-2.6.32.39/driver= s/dma/ioat/dma.h +--- linux-2.6.32.39/drivers/dma/ioat/dma.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/dma/ioat/dma.h 2011-04-17 15:56:46.000000000= -0400 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c unsigned long *phys_complete); void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *= type); @@ -26100,29 +25855,9 @@ diff -urNp linux-2.6.32.38/drivers/dma/ioat/dma.= h linux-2.6.32.38/drivers/dma/io extern struct ioat_sysfs_entry ioat_version_attr; extern struct ioat_sysfs_entry ioat_cap_attr; #endif /* IOATDMA_H */ -diff -urNp linux-2.6.32.38/drivers/edac/edac_core.h linux-2.6.32.38/driv= ers/edac/edac_core.h ---- linux-2.6.32.38/drivers/edac/edac_core.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/edac/edac_core.h 2011-04-17 15:56:46.0000000= 00 -0400 -@@ -99,11 +99,11 @@ extern int edac_debug_level; -=20 - #else /* !CONFIG_EDAC_DEBUG */ -=20 --#define debugf0( ... ) --#define debugf1( ... ) --#define debugf2( ... ) --#define debugf3( ... ) --#define debugf4( ... ) -+#define debugf0( ... ) do {} while (0) -+#define debugf1( ... ) do {} while (0) -+#define debugf2( ... ) do {} while (0) -+#define debugf3( ... ) do {} while (0) -+#define debugf4( ... ) do {} while (0) -=20 - #endif /* !CONFIG_EDAC_DEBUG */ -=20 -diff -urNp linux-2.6.32.38/drivers/edac/edac_device_sysfs.c linux-2.6.32= .38/drivers/edac/edac_device_sysfs.c ---- linux-2.6.32.38/drivers/edac/edac_device_sysfs.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/edac/edac_device_sysfs.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/edac/edac_device_sysfs.c linux-2.6.32= .39/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32.39/drivers/edac/edac_device_sysfs.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/edac/edac_device_sysfs.c 2011-04-17 15:56:46= .000000000 -0400 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } =20 @@ -26150,9 +25885,9 @@ diff -urNp linux-2.6.32.38/drivers/edac/edac_devi= ce_sysfs.c linux-2.6.32.38/driv .show =3D edac_dev_block_show, .store =3D edac_dev_block_store }; -diff -urNp linux-2.6.32.38/drivers/edac/edac_mc_sysfs.c linux-2.6.32.38/= drivers/edac/edac_mc_sysfs.c ---- linux-2.6.32.38/drivers/edac/edac_mc_sysfs.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c linux-2.6.32.39/= drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -26171,9 +25906,9 @@ diff -urNp linux-2.6.32.38/drivers/edac/edac_mc_s= ysfs.c linux-2.6.32.38/drivers/ .show =3D mcidev_show, .store =3D mcidev_store }; -diff -urNp linux-2.6.32.38/drivers/edac/edac_pci_sysfs.c linux-2.6.32.38= /drivers/edac/edac_pci_sysfs.c ---- linux-2.6.32.38/drivers/edac/edac_pci_sysfs.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/edac/edac_pci_sysfs.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c linux-2.6.32.39= /drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s } =20 @@ -26192,9 +25927,9 @@ diff -urNp linux-2.6.32.38/drivers/edac/edac_pci_= sysfs.c linux-2.6.32.38/drivers .show =3D edac_pci_dev_show, .store =3D edac_pci_dev_store }; -diff -urNp linux-2.6.32.38/drivers/firewire/core-cdev.c linux-2.6.32.38/= drivers/firewire/core-cdev.c ---- linux-2.6.32.38/drivers/firewire/core-cdev.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/firewire/core-cdev.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/firewire/core-cdev.c linux-2.6.32.39/= drivers/firewire/core-cdev.c +--- linux-2.6.32.39/drivers/firewire/core-cdev.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/firewire/core-cdev.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie int ret; =20 @@ -26205,9 +25940,9 @@ diff -urNp linux-2.6.32.38/drivers/firewire/core-= cdev.c linux-2.6.32.38/drivers/ return -EINVAL; =20 r =3D kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-2.6.32.38/drivers/firmware/dmi_scan.c linux-2.6.32.38/d= rivers/firmware/dmi_scan.c ---- linux-2.6.32.38/drivers/firmware/dmi_scan.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/firmware/dmi_scan.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/firmware/dmi_scan.c linux-2.6.32.39/d= rivers/firmware/dmi_scan.c +--- linux-2.6.32.39/drivers/firmware/dmi_scan.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/firmware/dmi_scan.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -26220,9 +25955,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/dmi_s= can.c linux-2.6.32.38/drivers/f p =3D dmi_ioremap(0xF0000, 0x10000); if (p =3D=3D NULL) goto error; -diff -urNp linux-2.6.32.38/drivers/firmware/edd.c linux-2.6.32.38/driver= s/firmware/edd.c ---- linux-2.6.32.38/drivers/firmware/edd.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/firmware/edd.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/firmware/edd.c linux-2.6.32.39/driver= s/firmware/edd.c +--- linux-2.6.32.39/drivers/firmware/edd.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/firmware/edd.c 2011-04-17 15:56:46.000000000= -0400 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -26232,9 +25967,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/edd.c= linux-2.6.32.38/drivers/firmwa .show =3D edd_attr_show, }; =20 -diff -urNp linux-2.6.32.38/drivers/firmware/efivars.c linux-2.6.32.38/dr= ivers/firmware/efivars.c ---- linux-2.6.32.38/drivers/firmware/efivars.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/firmware/efivars.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/firmware/efivars.c linux-2.6.32.39/dr= ivers/firmware/efivars.c +--- linux-2.6.32.39/drivers/firmware/efivars.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/firmware/efivars.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct=20 return ret; } @@ -26244,9 +25979,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/efiva= rs.c linux-2.6.32.38/drivers/fi .show =3D efivar_attr_show, .store =3D efivar_attr_store, }; -diff -urNp linux-2.6.32.38/drivers/firmware/iscsi_ibft.c linux-2.6.32.38= /drivers/firmware/iscsi_ibft.c ---- linux-2.6.32.38/drivers/firmware/iscsi_ibft.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/firmware/iscsi_ibft.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/firmware/iscsi_ibft.c linux-2.6.32.39= /drivers/firmware/iscsi_ibft.c +--- linux-2.6.32.39/drivers/firmware/iscsi_ibft.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/firmware/iscsi_ibft.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -26256,9 +25991,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/iscsi= _ibft.c linux-2.6.32.38/drivers .show =3D ibft_show_attribute, }; =20 -diff -urNp linux-2.6.32.38/drivers/firmware/memmap.c linux-2.6.32.38/dri= vers/firmware/memmap.c ---- linux-2.6.32.38/drivers/firmware/memmap.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/firmware/memmap.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/firmware/memmap.c linux-2.6.32.39/dri= vers/firmware/memmap.c +--- linux-2.6.32.39/drivers/firmware/memmap.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/firmware/memmap.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] =3D { NULL }; @@ -26268,9 +26003,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/memma= p.c linux-2.6.32.38/drivers/fir .show =3D memmap_attr_show, }; =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.3= 2.38/drivers/gpu/drm/drm_crtc_helper.c ---- linux-2.6.32.38/drivers/gpu/drm/drm_crtc_helper.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/drm_crtc_helper.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.3= 2.39/drivers/gpu/drm/drm_crtc_helper.c +--- linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d struct drm_crtc *tmp; int crtc_mask =3D 1; @@ -26280,9 +26015,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_cr= tc_helper.c linux-2.6.32.38/dri =20 dev =3D crtc->dev; =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_drv.c linux-2.6.32.38/dri= vers/gpu/drm/drm_drv.c ---- linux-2.6.32.38/drivers/gpu/drm/drm_drv.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/drm_drv.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_drv.c linux-2.6.32.39/dri= vers/gpu/drm/drm_drv.c +--- linux-2.6.32.39/drivers/gpu/drm/drm_drv.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/drm_drv.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata =3D NULL; =20 @@ -26292,9 +26027,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_dr= v.c linux-2.6.32.38/drivers/gpu ++file_priv->ioctl_count; =20 DRM_DEBUG("pid=3D%d, cmd=3D0x%02x, nr=3D0x%02x, dev 0x%lx, auth=3D%d\n= ", -diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_fops.c linux-2.6.32.38/dr= ivers/gpu/drm/drm_fops.c ---- linux-2.6.32.38/drivers/gpu/drm/drm_fops.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/drm_fops.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_fops.c linux-2.6.32.39/dr= ivers/gpu/drm/drm_fops.c +--- linux-2.6.32.39/drivers/gpu/drm/drm_fops.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/drm_fops.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } =20 @@ -26346,9 +26081,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_fo= ps.c linux-2.6.32.38/drivers/gp if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_gem.c linux-2.6.32.38/dri= vers/gpu/drm/drm_gem.c ---- linux-2.6.32.38/drivers/gpu/drm/drm_gem.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/drm_gem.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_gem.c linux-2.6.32.39/dri= vers/gpu/drm/drm_gem.c +--- linux-2.6.32.39/drivers/gpu/drm/drm_gem.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/drm_gem.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev) spin_lock_init(&dev->object_name_lock); idr_init(&dev->object_name_idr); @@ -26382,9 +26117,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_ge= m.c linux-2.6.32.38/drivers/gpu kfree(obj); } EXPORT_SYMBOL(drm_gem_object_free); -diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_info.c linux-2.6.32.38/dr= ivers/gpu/drm/drm_info.c ---- linux-2.6.32.38/drivers/gpu/drm/drm_info.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/drm_info.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_info.c linux-2.6.32.39/dr= ivers/gpu/drm/drm_info.c +--- linux-2.6.32.39/drivers/gpu/drm/drm_info.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/drm_info.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void struct drm_local_map *map; struct drm_map_list *r_list; @@ -26464,9 +26199,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_in= fo.c linux-2.6.32.38/drivers/gp =20 #if defined(__i386__) pgprot =3D pgprot_val(vma->vm_page_prot); -diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.38/d= rivers/gpu/drm/drm_ioctl.c ---- linux-2.6.32.38/drivers/gpu/drm/drm_ioctl.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.39/d= rivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, stats->data[i].value =3D (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lo= ck->lock : 0); @@ -26476,9 +26211,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_io= ctl.c linux-2.6.32.38/drivers/g stats->data[i].type =3D dev->types[i]; } =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_lock.c linux-2.6.32.38/dr= ivers/gpu/drm/drm_lock.c ---- linux-2.6.32.38/drivers/gpu/drm/drm_lock.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/drm_lock.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_lock.c linux-2.6.32.39/dr= ivers/gpu/drm/drm_lock.c +--- linux-2.6.32.39/drivers/gpu/drm/drm_lock.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/drm_lock.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv =3D file_priv; @@ -26497,9 +26232,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_lo= ck.c linux-2.6.32.38/drivers/gp =20 /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.= 38/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.32.38/drivers/gpu/drm/i810/i810_dma.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.= 39/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -26522,9 +26257,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i810/i= 810_dma.c linux-2.6.32.38/drive sarea_priv->last_enqueue =3D dev_priv->counter - 1; sarea_priv->last_dispatch =3D (int)hw_status[5]; =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.3= 2.38/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.3= 2.39/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ } } @@ -26534,9 +26269,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/d= vo_ch7017.c linux-2.6.32.38/dri .init =3D ch7017_init, .detect =3D ch7017_detect, .mode_valid =3D ch7017_mode_valid, -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.3= 2.38/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.3= 2.39/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -26546,9 +26281,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/d= vo_ch7xxx.c linux-2.6.32.38/dri .init =3D ch7xxx_init, .detect =3D ch7xxx_detect, .mode_valid =3D ch7xxx_mode_valid, -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo.h linux-2.6.32.38/dr= ivers/gpu/drm/i915/dvo.h ---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h linux-2.6.32.39/dr= ivers/gpu/drm/i915/dvo.h +--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -26581,9 +26316,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/d= vo.h linux-2.6.32.38/drivers/gp +extern const struct intel_dvo_dev_ops ch7017_ops; =20 #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.= 38/drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.= 39/drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -26593,9 +26328,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/d= vo_ivch.c linux-2.6.32.38/drive .init =3D ivch_init, .dpms =3D ivch_dpms, .save =3D ivch_save, -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.3= 2.38/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.3= 2.39/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -26605,9 +26340,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/d= vo_sil164.c linux-2.6.32.38/dri .init =3D sil164_init, .detect =3D sil164_detect, .mode_valid =3D sil164_mode_valid, -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.3= 2.38/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.3= 2.39/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -26617,9 +26352,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/d= vo_tfp410.c linux-2.6.32.38/dri .init =3D tfp410_init, .detect =3D tfp410_detect, .mode_valid =3D tfp410_mode_valid, -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.= 38/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.32.38/drivers/gpu/drm/i915/i915_drv.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.= 39/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -26629,9 +26364,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/i= 915_drv.c linux-2.6.32.38/drive .fault =3D i915_gem_fault, .open =3D drm_gem_vm_open, .close =3D drm_gem_vm_close, -diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.= 38/drivers/gpu/drm/i915/i915_gem.c ---- linux-2.6.32.38/drivers/gpu/drm/i915/i915_gem.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/i915/i915_gem.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.= 39/drivers/gpu/drm/i915/i915_gem.c +--- linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d =20 args->aper_size =3D dev->gtt_total; @@ -26714,9 +26449,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/i= 915_gem.c linux-2.6.32.38/drive } i915_verify_inactive(dev, __FILE__, __LINE__); } -diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/mkregtable.c linux-2.6= .32.38/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.32.38/drivers/gpu/drm/radeon/mkregtable.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c linux-2.6= .32.39/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:56= :46.000000000 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t,=20 regex_t mask_rex; regmatch_t match[4]; @@ -26734,9 +26469,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon= /mkregtable.c linux-2.6.32.38/d =20 if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c linu= x-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c 2011-03-27 = 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c 2011-04-17 = 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c linu= x-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-04-17 = 15:56:46.000000000 -0400 @@ -520,13 +520,13 @@ static uint16_t atombios_get_connector_o } } @@ -26761,9 +26496,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon= /radeon_atombios.c linux-2.6.32 =20 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c linux= -2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c ---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c linux= -2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c +--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl =20 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { @@ -26773,10 +26508,10 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/rade= on/radeon_display.c linux-2.6.32. } else error =3D abs(current_freq - freq); vco_diff =3D abs(vco - best_vco); -diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2= .6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c ---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-17 15:= 56:46.000000000 -0400 -@@ -289,7 +289,7 @@ static int compat_radeon_cp_getparam(str +diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2= .6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c +--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-23 13:= 57:24.000000000 -0400 +@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(str request =3D compat_alloc_user_space(sizeof(*request)); if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) || __put_user(req32.param, &request->param) @@ -26785,9 +26520,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon= /radeon_ioc32.c linux-2.6.32.38 &request->value)) return -EFAULT; =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_state.c linux-2= .6.32.38/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_state.c 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:= 56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c linux-2= .6.32.39/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:= 56:46.000000000 -0400 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv =3D dev->dev_private; @@ -26797,9 +26532,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon= /radeon_state.c linux-2.6.32.38 =20 DRM_DEBUG("pid=3D%d\n", DRM_CURRENTPID); =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6= .32.38/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6= .32.39/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:56= :46.000000000 -0400 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -26851,9 +26586,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon= /radeon_ttm.c linux-2.6.32.38/d } =20 =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.3= 8/drivers/gpu/drm/radeon/rs690.c ---- linux-2.6.32.38/drivers/gpu/drm/radeon/rs690.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.3= 9/drivers/gpu/drm/radeon/rs690.c +--- linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) @@ -26867,18 +26602,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeo= n/rs690.c linux-2.6.32.38/driver } else { if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) -diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.38/= drivers/gpu/drm/ttm/ttm_bo.c ---- linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo.c 2011-04-17 15:56:46.000= 000000 -0400 -@@ -39,7 +39,7 @@ - #include -=20 - #define TTM_ASSERT_LOCKED(param) --#define TTM_DEBUG(fmt, arg...) -+#define TTM_DEBUG(fmt, arg...) do {} while (0) - #define TTM_BO_HASH_ORDER 13 -=20 - static int ttm_bo_setup_vm(struct ttm_buffer_object *bo); +diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.39/= drivers/gpu/drm/ttm/ttm_bo.c +--- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c 2011-04-23 12:56:11.000= 000000 -0400 @@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a NULL }; @@ -26888,9 +26614,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/tt= m_bo.c linux-2.6.32.38/drivers/ .show =3D &ttm_bo_global_show }; =20 -diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.= 38/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.= 39/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo =3D (struct ttm_buffer_object *) @@ -26911,9 +26637,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/tt= m_bo_vm.c linux-2.6.32.38/drive /* * Work around locking order reversal in fault / nopfn * between mmap_sem and bo_reserve: Perform a trylock operation -diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32= .38/drivers/gpu/drm/ttm/ttm_global.c ---- linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_global.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_global.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32= .39/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c 2011-04-17 15:56:46= .000000000 -0400 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -26971,9 +26697,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/tt= m_global.c linux-2.6.32.38/driv ref->release(ref); item->object =3D NULL; } -diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32= .38/drivers/gpu/drm/ttm/ttm_memory.c ---- linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_memory.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_memory.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32= .39/drivers/gpu/drm/ttm/ttm_memory.c +--- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c 2011-04-17 15:56:46= .000000000 -0400 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at NULL }; @@ -26983,9 +26709,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/tt= m_memory.c linux-2.6.32.38/driv .show =3D &ttm_mem_zone_show, .store =3D &ttm_mem_zone_store }; -diff -urNp linux-2.6.32.38/drivers/hid/usbhid/hiddev.c linux-2.6.32.38/d= rivers/hid/usbhid/hiddev.c ---- linux-2.6.32.38/drivers/hid/usbhid/hiddev.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/hid/usbhid/hiddev.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/hid/usbhid/hiddev.c linux-2.6.32.39/d= rivers/hid/usbhid/hiddev.c +--- linux-2.6.32.39/drivers/hid/usbhid/hiddev.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/hid/usbhid/hiddev.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi return put_user(HID_VERSION, (int __user *)arg); =20 @@ -26995,57 +26721,9 @@ diff -urNp linux-2.6.32.38/drivers/hid/usbhid/hi= ddev.c linux-2.6.32.38/drivers/h return -EINVAL; =20 for (i =3D 0; i < hid->maxcollection; i++) -diff -urNp linux-2.6.32.38/drivers/hwmon/k8temp.c linux-2.6.32.38/driver= s/hwmon/k8temp.c ---- linux-2.6.32.38/drivers/hwmon/k8temp.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/hwmon/k8temp.c 2011-04-17 15:56:46.000000000= -0400 -@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n -=20 - static struct pci_device_id k8temp_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, -- { 0 }, -+ { 0, 0, 0, 0, 0, 0, 0 }, - }; -=20 - MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.32.38/drivers/hwmon/sis5595.c linux-2.6.32.38/drive= rs/hwmon/sis5595.c ---- linux-2.6.32.38/drivers/hwmon/sis5595.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/hwmon/sis5595.c 2011-04-17 15:56:46.00000000= 0 -0400 -@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda -=20 - static struct pci_device_id sis5595_pci_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.32.38/drivers/hwmon/via686a.c linux-2.6.32.38/drive= rs/hwmon/via686a.c ---- linux-2.6.32.38/drivers/hwmon/via686a.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/hwmon/via686a.c 2011-04-17 15:56:46.00000000= 0 -0400 -@@ -777,7 +777,7 @@ static struct via686a_data *via686a_upda -=20 - static struct pci_device_id via686a_pci_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.32.38/drivers/hwmon/vt8231.c linux-2.6.32.38/driver= s/hwmon/vt8231.c ---- linux-2.6.32.38/drivers/hwmon/vt8231.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/hwmon/vt8231.c 2011-04-17 15:56:46.000000000= -0400 -@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri -=20 - static struct pci_device_id vt8231_pci_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.32.38/drivers/hwmon/w83791d.c linux-2.6.32.38/drive= rs/hwmon/w83791d.c ---- linux-2.6.32.38/drivers/hwmon/w83791d.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/hwmon/w83791d.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/hwmon/w83791d.c linux-2.6.32.39/drive= rs/hwmon/w83791d.c +--- linux-2.6.32.39/drivers/hwmon/w83791d.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/hwmon/w83791d.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -27057,66 +26735,9 @@ diff -urNp linux-2.6.32.38/drivers/hwmon/w83791d= .c linux-2.6.32.38/drivers/hwmon static struct w83791d_data *w83791d_update_device(struct device *dev); =20 #ifdef DEBUG -diff -urNp linux-2.6.32.38/drivers/i2c/busses/i2c-i801.c linux-2.6.32.38= /drivers/i2c/busses/i2c-i801.c ---- linux-2.6.32.38/drivers/i2c/busses/i2c-i801.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/i2c/busses/i2c-i801.c 2011-04-17 15:56:46.00= 0000000 -0400 -@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =3D - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.32.38/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.3= 8/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.32.38/drivers/i2c/busses/i2c-piix4.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/i2c/busses/i2c-piix4.c 2011-04-17 15:56:46.0= 00000000 -0400 -@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat - .ident =3D "IBM", - .matches =3D { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, - }, -- { }, -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, -@@ -491,7 +491,7 @@ static struct pci_device_id piix4_ids[]=20 - PCI_DEVICE_ID_SERVERWORKS_HT1000SB) }, - { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, - PCI_DEVICE_ID_SERVERWORKS_HT1100LD) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.32.38/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.= 38/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.32.38/drivers/i2c/busses/i2c-sis630.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/i2c/busses/i2c-sis630.c 2011-04-17 15:56:46.= 000000000 -0400 -@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter - static struct pci_device_id sis630_ids[] __devinitdata =3D { - { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, - { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.32.38/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.= 38/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.32.38/drivers/i2c/busses/i2c-sis96x.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/i2c/busses/i2c-sis96x.c 2011-04-17 15:56:46.= 000000000 -0400 -@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter -=20 - static struct pci_device_id sis96x_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.32.38/drivers/ide/ide-cd.c linux-2.6.32.38/drivers/= ide/ide-cd.c ---- linux-2.6.32.38/drivers/ide/ide-cd.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/ide/ide-cd.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/drivers/ide/ide-cd.c linux-2.6.32.39/drivers/= ide/ide-cd.c +--- linux-2.6.32.39/drivers/ide/ide-cd.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/drivers/ide/ide-cd.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment =3D queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -27126,9 +26747,9 @@ diff -urNp linux-2.6.32.38/drivers/ide/ide-cd.c l= inux-2.6.32.38/drivers/ide/ide- drive->dma =3D 0; } } -diff -urNp linux-2.6.32.38/drivers/ieee1394/dv1394.c linux-2.6.32.38/dri= vers/ieee1394/dv1394.c ---- linux-2.6.32.38/drivers/ieee1394/dv1394.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/ieee1394/dv1394.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/ieee1394/dv1394.c linux-2.6.32.39/dri= vers/ieee1394/dv1394.c +--- linux-2.6.32.39/drivers/ieee1394/dv1394.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/ieee1394/dv1394.c 2011-04-23 12:56:11.000000= 000 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -27138,30 +26759,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/dv13= 94.c linux-2.6.32.38/drivers/iee frame_put_packet (struct frame *f, struct packet *p) { int section_type =3D p->data[0] >> 5; /* section type is in = bits 5 - 7 */ -@@ -2178,7 +2178,7 @@ static const struct ieee1394_device_id d - .specifier_id =3D AVC_UNIT_SPEC_ID_ENTRY & 0xffffff, - .version =3D AVC_SW_VERSION_ENTRY & 0xffffff - }, -- { } -+ { 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.32.38/drivers/ieee1394/eth1394.c linux-2.6.32.38/dr= ivers/ieee1394/eth1394.c ---- linux-2.6.32.38/drivers/ieee1394/eth1394.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ieee1394/eth1394.c 2011-04-17 15:56:46.00000= 0000 -0400 -@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e - .specifier_id =3D ETHER1394_GASP_SPECIFIER_ID, - .version =3D ETHER1394_GASP_VERSION, - }, -- {} -+ { 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.32.38/drivers/ieee1394/hosts.c linux-2.6.32.38/driv= ers/ieee1394/hosts.c ---- linux-2.6.32.38/drivers/ieee1394/hosts.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/ieee1394/hosts.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/ieee1394/hosts.c linux-2.6.32.39/driv= ers/ieee1394/hosts.c +--- linux-2.6.32.39/drivers/ieee1394/hosts.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/ieee1394/hosts.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso=20 } =20 @@ -27170,9 +26770,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/hosts= .c linux-2.6.32.38/drivers/ieee .transmit_packet =3D dummy_transmit_packet, .devctl =3D dummy_devctl, .isoctl =3D dummy_isoctl -diff -urNp linux-2.6.32.38/drivers/ieee1394/init_ohci1394_dma.c linux-2.= 6.32.38/drivers/ieee1394/init_ohci1394_dma.c ---- linux-2.6.32.38/drivers/ieee1394/init_ohci1394_dma.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/ieee1394/init_ohci1394_dma.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c linux-2.= 6.32.39/drivers/ieee1394/init_ohci1394_dma.c +--- linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con for (func =3D 0; func < 8; func++) { u32 class =3D read_pci_config(num,slot,func, @@ -27182,9 +26782,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/init_= ohci1394_dma.c linux-2.6.32.38/ continue; /* No device at this func */ =20 if (class>>8 !=3D PCI_CLASS_SERIAL_FIREWIRE_OHCI) -diff -urNp linux-2.6.32.38/drivers/ieee1394/ohci1394.c linux-2.6.32.38/d= rivers/ieee1394/ohci1394.c ---- linux-2.6.32.38/drivers/ieee1394/ohci1394.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/ieee1394/ohci1394.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/ieee1394/ohci1394.c linux-2.6.32.39/d= rivers/ieee1394/ohci1394.c +--- linux-2.6.32.39/drivers/ieee1394/ohci1394.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/ieee1394/ohci1394.c 2011-04-23 12:56:11.0000= 00000 -0400 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->h= ost->id , ## args) =20 @@ -27197,39 +26797,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/ohci= 1394.c linux-2.6.32.38/drivers/i =20 static void dma_trm_tasklet(unsigned long data); static void dma_trm_reset(struct dma_trm_ctx *d); -@@ -3449,7 +3449,7 @@ static struct pci_device_id ohci1394_pci - .subvendor =3D PCI_ANY_ID, - .subdevice =3D PCI_ANY_ID, - }, -- { 0, }, -+ { 0, 0, 0, 0, 0, 0, 0 }, - }; -=20 - MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.32.38/drivers/ieee1394/raw1394.c linux-2.6.32.38/dr= ivers/ieee1394/raw1394.c ---- linux-2.6.32.38/drivers/ieee1394/raw1394.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/ieee1394/raw1394.c 2011-04-17 15:56:46.00000= 0000 -0400 -@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r - .match_flags =3D IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION= , - .specifier_id =3D CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, - .version =3D (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff}, -- {} -+ { 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.32.38/drivers/ieee1394/sbp2.c linux-2.6.32.38/drive= rs/ieee1394/sbp2.c ---- linux-2.6.32.38/drivers/ieee1394/sbp2.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/ieee1394/sbp2.c 2011-04-17 15:56:46.00000000= 0 -0400 -@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s - .match_flags =3D IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION= , - .specifier_id =3D SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, - .version =3D SBP2_SW_VERSION_ENTRY & 0xffffff}, -- {} -+ { 0, 0, 0, 0, 0, 0 } - }; - MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table); -=20 +diff -urNp linux-2.6.32.39/drivers/ieee1394/sbp2.c linux-2.6.32.39/drive= rs/ieee1394/sbp2.c +--- linux-2.6.32.39/drivers/ieee1394/sbp2.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/ieee1394/sbp2.c 2011-04-23 12:56:11.00000000= 0 -0400 @@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME); MODULE_LICENSE("GPL"); @@ -27239,21 +26809,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/sbp2= .c linux-2.6.32.38/drivers/ieee1 { int ret; =20 -diff -urNp linux-2.6.32.38/drivers/ieee1394/video1394.c linux-2.6.32.38/= drivers/ieee1394/video1394.c ---- linux-2.6.32.38/drivers/ieee1394/video1394.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/ieee1394/video1394.c 2011-04-17 15:56:46.000= 000000 -0400 -@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v - .specifier_id =3D CAMERA_UNIT_SPEC_ID_ENTRY & 0xfffff= f, - .version =3D (CAMERA_SW_VERSION_ENTRY + 2) & 0xf= fffff - }, -- { } -+ { 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.32.38/drivers/infiniband/core/cm.c linux-2.6.32.38/= drivers/infiniband/core/cm.c ---- linux-2.6.32.38/drivers/infiniband/core/cm.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/infiniband/core/cm.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/infiniband/core/cm.c linux-2.6.32.39/= drivers/infiniband/core/cm.c +--- linux-2.6.32.39/drivers/infiniband/core/cm.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/infiniband/core/cm.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -112,7 +112,7 @@ static char const counter_group_names[CM =20 struct cm_counter_group { @@ -27397,9 +26955,9 @@ diff -urNp linux-2.6.32.38/drivers/infiniband/cor= e/cm.c linux-2.6.32.38/drivers/ .show =3D cm_show_counter }; =20 -diff -urNp linux-2.6.32.38/drivers/infiniband/core/sysfs.c linux-2.6.32.= 38/drivers/infiniband/core/sysfs.c ---- linux-2.6.32.38/drivers/infiniband/core/sysfs.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/infiniband/core/sysfs.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/infiniband/core/sysfs.c linux-2.6.32.= 39/drivers/infiniband/core/sysfs.c +--- linux-2.6.32.39/drivers/infiniband/core/sysfs.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/infiniband/core/sysfs.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -27409,9 +26967,9 @@ diff -urNp linux-2.6.32.38/drivers/infiniband/cor= e/sysfs.c linux-2.6.32.38/drive .show =3D port_attr_show }; =20 -diff -urNp linux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c lin= ux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c ---- linux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c 2011-03-27= 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c 2011-04-17= 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c lin= ux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c +--- linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c 2011-04-17= 15:56:46.000000000 -0400 @@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u dst->grh.sgid_index =3D src->grh.sgid_index; dst->grh.hop_limit =3D src->grh.hop_limit; @@ -27442,157 +27000,9 @@ diff -urNp linux-2.6.32.38/drivers/infiniband/c= ore/uverbs_marshall.c linux-2.6.3 } EXPORT_SYMBOL(ib_copy_qp_attr_to_user); =20 -diff -urNp linux-2.6.32.38/drivers/input/keyboard/atkbd.c linux-2.6.32.3= 8/drivers/input/keyboard/atkbd.c ---- linux-2.6.32.38/drivers/input/keyboard/atkbd.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/input/keyboard/atkbd.c 2011-04-17 15:56:46.0= 00000000 -0400 -@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri - .id =3D SERIO_ANY, - .extra =3D SERIO_ANY, - }, -- { 0 } -+ { 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.32.38/drivers/input/mouse/lifebook.c linux-2.6.32.3= 8/drivers/input/mouse/lifebook.c ---- linux-2.6.32.38/drivers/input/mouse/lifebook.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/input/mouse/lifebook.c 2011-04-17 15:56:46.0= 00000000 -0400 -@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo - DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} - }; -=20 - static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.32.38/drivers/input/mouse/psmouse-base.c linux-2.6.= 32.38/drivers/input/mouse/psmouse-base.c ---- linux-2.6.32.38/drivers/input/mouse/psmouse-base.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/input/mouse/psmouse-base.c 2011-04-17 15:56:= 46.000000000 -0400 -@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se - .id =3D SERIO_ANY, - .extra =3D SERIO_ANY, - }, -- { 0 } -+ { 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.32.38/drivers/input/mouse/synaptics.c linux-2.6.32.= 38/drivers/input/mouse/synaptics.c ---- linux-2.6.32.38/drivers/input/mouse/synaptics.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/input/mouse/synaptics.c 2011-04-17 15:56:46.= 000000000 -0400 -@@ -437,7 +437,7 @@ static void synaptics_process_packet(str - break; - case 2: - if (SYN_MODEL_PEN(priv->model_id)) -- ; /* Nothing, treat a pen as a single finger */ -+ break; /* Nothing, treat a pen as a single finger */ - break; - case 4 ... 15: - if (SYN_CAP_PALMDETECT(priv->capabilities)) -@@ -652,7 +652,6 @@ static const struct dmi_system_id toshib - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), - DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"), - }, -- - }, - { - .ident =3D "Toshiba Portege M300", -@@ -661,9 +660,8 @@ static const struct dmi_system_id toshib - DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"), - DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"), - }, -- - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; - #endif -=20 -diff -urNp linux-2.6.32.38/drivers/input/mousedev.c linux-2.6.32.38/driv= ers/input/mousedev.c ---- linux-2.6.32.38/drivers/input/mousedev.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/input/mousedev.c 2011-04-17 15:56:46.0000000= 00 -0400 -@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han -=20 - #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX - static struct miscdevice psaux_mouse =3D { -- PSMOUSE_MINOR, "psaux", &mousedev_fops -+ PSMOUSE_MINOR, "psaux", &mousedev_fops, {NULL, NULL}, NULL, NULL - }; - static int psaux_registered; - #endif -diff -urNp linux-2.6.32.38/drivers/input/serio/i8042-x86ia64io.h linux-2= .6.32.38/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.32.38/drivers/input/serio/i8042-x86ia64io.h 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/input/serio/i8042-x86ia64io.h 2011-04-17 15:= 56:46.000000000 -0400 -@@ -179,7 +179,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - /* -@@ -423,7 +423,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static const struct dmi_system_id __initconst i8042_dmi_reset_table[] =3D= { -@@ -497,7 +497,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - #ifdef CONFIG_PNP -@@ -516,7 +516,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = =3D { -@@ -540,7 +540,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; - #endif -=20 -@@ -625,7 +625,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.32.38/drivers/input/serio/serio_raw.c linux-2.6.32.= 38/drivers/input/serio/serio_raw.c ---- linux-2.6.32.38/drivers/input/serio/serio_raw.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/input/serio/serio_raw.c 2011-04-17 15:56:46.= 000000000 -0400 -@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ - .id =3D SERIO_ANY, - .extra =3D SERIO_ANY, - }, -- { 0 } -+ { 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/common.c linux-2.6.32.38= /drivers/isdn/gigaset/common.c ---- linux-2.6.32.38/drivers/isdn/gigaset/common.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/isdn/gigaset/common.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/common.c linux-2.6.32.39= /drivers/isdn/gigaset/common.c +--- linux-2.6.32.39/drivers/isdn/gigaset/common.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/isdn/gigaset/common.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct=20 cs->commands_pending =3D 0; cs->cur_at_seq =3D 0; @@ -27602,9 +27012,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/c= ommon.c linux-2.6.32.38/drivers cs->dev =3D NULL; cs->tty =3D NULL; cs->tty_dev =3D NULL; -diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/gigaset.h linux-2.6.32.3= 8/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.32.38/drivers/isdn/gigaset/gigaset.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h linux-2.6.32.3= 9/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:56:46.0= 00000000 -0400 @@ -34,6 +34,7 @@ #include #include @@ -27622,9 +27032,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/g= igaset.h linux-2.6.32.38/driver struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/interface.c linux-2.6.32= .38/drivers/isdn/gigaset/interface.c ---- linux-2.6.32.38/drivers/isdn/gigaset/interface.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/isdn/gigaset/interface.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/interface.c linux-2.6.32= .39/drivers/isdn/gigaset/interface.c +--- linux-2.6.32.39/drivers/isdn/gigaset/interface.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/isdn/gigaset/interface.c 2011-04-17 15:56:46= .000000000 -0400 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data =3D cs; @@ -27712,9 +27122,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/i= nterface.c linux-2.6.32.38/driv dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.32.38/drivers/isdn/hardware/avm/b1.c linux-2.6.32.3= 8/drivers/isdn/hardware/avm/b1.c ---- linux-2.6.32.38/drivers/isdn/hardware/avm/b1.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c linux-2.6.32.3= 9/drivers/isdn/hardware/avm/b1.c +--- linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -27733,9 +27143,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/hardware/= avm/b1.c linux-2.6.32.38/driver return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.32.38/drivers/isdn/icn/icn.c linux-2.6.32.38/driver= s/isdn/icn/icn.c ---- linux-2.6.32.38/drivers/isdn/icn/icn.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/isdn/icn/icn.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/isdn/icn/icn.c linux-2.6.32.39/driver= s/isdn/icn/icn.c +--- linux-2.6.32.39/drivers/isdn/icn/icn.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/isdn/icn/icn.c 2011-04-17 15:56:46.000000000= -0400 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count =3D len; @@ -27745,9 +27155,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/icn/icn.c= linux-2.6.32.38/drivers/isdn/i return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.32.38/drivers/isdn/mISDN/socket.c linux-2.6.32.38/d= rivers/isdn/mISDN/socket.c ---- linux-2.6.32.38/drivers/isdn/mISDN/socket.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/isdn/mISDN/socket.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/isdn/mISDN/socket.c linux-2.6.32.39/d= rivers/isdn/mISDN/socket.c +--- linux-2.6.32.39/drivers/isdn/mISDN/socket.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/isdn/mISDN/socket.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns if (dev) { struct mISDN_devinfo di; @@ -27764,9 +27174,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/mISDN/soc= ket.c linux-2.6.32.38/drivers/i di.id =3D dev->id; di.Dprotocols =3D dev->Dprotocols; di.Bprotocols =3D dev->Bprotocols | get_all_Bprotocols(); -diff -urNp linux-2.6.32.38/drivers/isdn/sc/interrupt.c linux-2.6.32.38/d= rivers/isdn/sc/interrupt.c ---- linux-2.6.32.38/drivers/isdn/sc/interrupt.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/isdn/sc/interrupt.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/isdn/sc/interrupt.c linux-2.6.32.39/d= rivers/isdn/sc/interrupt.c +--- linux-2.6.32.39/drivers/isdn/sc/interrupt.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/isdn/sc/interrupt.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy, } else if(callid>=3D0x0000 && callid<=3D0x7FFF) @@ -27801,9 +27211,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/sc/interr= upt.c linux-2.6.32.38/drivers/i continue; } =09 -diff -urNp linux-2.6.32.38/drivers/lguest/core.c linux-2.6.32.38/drivers= /lguest/core.c ---- linux-2.6.32.38/drivers/lguest/core.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/lguest/core.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/lguest/core.c linux-2.6.32.39/drivers= /lguest/core.c +--- linux-2.6.32.39/drivers/lguest/core.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/lguest/core.c 2011-04-17 15:56:46.000000000 = -0400 @@ -91,9 +91,17 @@ static __init int map_switcher(void) * it's worked so far. The end address needs +1 because __get_vm_area * allocates an extra guard page, so we need space for that. @@ -27831,9 +27241,9 @@ diff -urNp linux-2.6.32.38/drivers/lguest/core.c = linux-2.6.32.38/drivers/lguest/ end_switcher_text - start_switcher_text); =20 printk(KERN_INFO "lguest: mapped switcher at %p\n", -diff -urNp linux-2.6.32.38/drivers/lguest/x86/core.c linux-2.6.32.38/dri= vers/lguest/x86/core.c ---- linux-2.6.32.38/drivers/lguest/x86/core.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/lguest/x86/core.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/lguest/x86/core.c linux-2.6.32.39/dri= vers/lguest/x86/core.c +--- linux-2.6.32.39/drivers/lguest/x86/core.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/lguest/x86/core.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -59,7 +59,7 @@ static struct { /* Offset from where switcher.S was compiled to where we've copied it *= / static unsigned long switcher_offset(void) @@ -27875,9 +27285,9 @@ diff -urNp linux-2.6.32.38/drivers/lguest/x86/cor= e.c linux-2.6.32.38/drivers/lgu lguest_entry.segment =3D LGUEST_CS; =20 /* -diff -urNp linux-2.6.32.38/drivers/lguest/x86/switcher_32.S linux-2.6.32= .38/drivers/lguest/x86/switcher_32.S ---- linux-2.6.32.38/drivers/lguest/x86/switcher_32.S 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/lguest/x86/switcher_32.S 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/lguest/x86/switcher_32.S linux-2.6.32= .39/drivers/lguest/x86/switcher_32.S +--- linux-2.6.32.39/drivers/lguest/x86/switcher_32.S 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/lguest/x86/switcher_32.S 2011-04-17 15:56:46= .000000000 -0400 @@ -87,6 +87,7 @@ #include #include @@ -27936,9 +27346,9 @@ diff -urNp linux-2.6.32.38/drivers/lguest/x86/swi= tcher_32.S linux-2.6.32.38/driv =20 // Every interrupt can come to us here // But we must truly tell each apart. -diff -urNp linux-2.6.32.38/drivers/macintosh/via-pmu-backlight.c linux-2= .6.32.38/drivers/macintosh/via-pmu-backlight.c ---- linux-2.6.32.38/drivers/macintosh/via-pmu-backlight.c 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/macintosh/via-pmu-backlight.c 2011-04-17 15:= 56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c linux-2= .6.32.39/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c 2011-04-17 15:= 56:46.000000000 -0400 @@ -15,7 +15,7 @@ =20 #define MAX_PMU_LEVEL 0xFF @@ -27957,9 +27367,9 @@ diff -urNp linux-2.6.32.38/drivers/macintosh/via-= pmu-backlight.c linux-2.6.32.38 .get_brightness =3D pmu_backlight_get_brightness, .update_status =3D pmu_backlight_update_status, =20 -diff -urNp linux-2.6.32.38/drivers/macintosh/via-pmu.c linux-2.6.32.38/d= rivers/macintosh/via-pmu.c ---- linux-2.6.32.38/drivers/macintosh/via-pmu.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/macintosh/via-pmu.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/macintosh/via-pmu.c linux-2.6.32.39/d= rivers/macintosh/via-pmu.c +--- linux-2.6.32.39/drivers/macintosh/via-pmu.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/macintosh/via-pmu.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >=3D 0); } @@ -27969,21 +27379,9 @@ diff -urNp linux-2.6.32.38/drivers/macintosh/via= -pmu.c linux-2.6.32.38/drivers/m .enter =3D powerbook_sleep, .valid =3D pmu_sleep_valid, }; -diff -urNp linux-2.6.32.38/drivers/md/bitmap.c linux-2.6.32.38/drivers/m= d/bitmap.c ---- linux-2.6.32.38/drivers/md/bitmap.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/drivers/md/bitmap.c 2011-04-17 15:56:46.000000000 -0= 400 -@@ -58,7 +58,7 @@ - # if DEBUG > 0 - # define PRINTK(x...) printk(KERN_DEBUG x) - # else --# define PRINTK(x...) -+# define PRINTK(x...) do {} while (0) - # endif - #endif -=20 -diff -urNp linux-2.6.32.38/drivers/md/dm-ioctl.c linux-2.6.32.38/drivers= /md/dm-ioctl.c ---- linux-2.6.32.38/drivers/md/dm-ioctl.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/md/dm-ioctl.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/md/dm-ioctl.c linux-2.6.32.39/drivers= /md/dm-ioctl.c +--- linux-2.6.32.39/drivers/md/dm-ioctl.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/md/dm-ioctl.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str cmd =3D=3D DM_LIST_VERSIONS_CMD) return 0; @@ -27993,9 +27391,9 @@ diff -urNp linux-2.6.32.38/drivers/md/dm-ioctl.c = linux-2.6.32.38/drivers/md/dm-i if (!*param->name) { DMWARN("name not supplied when creating device"); return -EINVAL; -diff -urNp linux-2.6.32.38/drivers/md/dm-sysfs.c linux-2.6.32.38/drivers= /md/dm-sysfs.c ---- linux-2.6.32.38/drivers/md/dm-sysfs.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/md/dm-sysfs.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/md/dm-sysfs.c linux-2.6.32.39/drivers= /md/dm-sysfs.c +--- linux-2.6.32.39/drivers/md/dm-sysfs.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/md/dm-sysfs.c 2011-04-17 15:56:46.000000000 = -0400 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] =3D { NULL, }; @@ -28005,9 +27403,9 @@ diff -urNp linux-2.6.32.38/drivers/md/dm-sysfs.c = linux-2.6.32.38/drivers/md/dm-s .show =3D dm_attr_show, }; =20 -diff -urNp linux-2.6.32.38/drivers/md/dm-table.c linux-2.6.32.38/drivers= /md/dm-table.c ---- linux-2.6.32.38/drivers/md/dm-table.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/md/dm-table.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/md/dm-table.c linux-2.6.32.39/drivers= /md/dm-table.c +--- linux-2.6.32.39/drivers/md/dm-table.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/md/dm-table.c 2011-04-17 15:56:46.000000000 = -0400 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -28017,9 +27415,9 @@ diff -urNp linux-2.6.32.38/drivers/md/dm-table.c = linux-2.6.32.38/drivers/md/dm-t DMWARN("%s: %s too small for target: " "start=3D%llu, len=3D%llu, dev_size=3D%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.32.38/drivers/md/md.c linux-2.6.32.38/drivers/md/md= .c ---- linux-2.6.32.38/drivers/md/md.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/md/md.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/md/md.c linux-2.6.32.39/drivers/md/md= .c +--- linux-2.6.32.39/drivers/md/md.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/md/md.c 2011-04-17 15:56:46.000000000 -0400 @@ -2517,7 +2517,7 @@ static void rdev_free(struct kobject *ko mdk_rdev_t *rdev =3D container_of(ko, mdk_rdev_t, kobj); kfree(rdev); @@ -28066,9 +27464,9 @@ diff -urNp linux-2.6.32.38/drivers/md/md.c linux-= 2.6.32.38/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-2.6.32.38/drivers/md/md.h linux-2.6.32.38/drivers/md/md= .h ---- linux-2.6.32.38/drivers/md/md.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/md/md.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/md/md.h linux-2.6.32.39/drivers/md/md= .h +--- linux-2.6.32.39/drivers/md/md.h 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/md/md.h 2011-04-17 15:56:46.000000000 -0400 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ =20 static inline void md_sync_acct(struct block_device *bdev, unsigned lon= g nr_sectors) @@ -28078,9 +27476,9 @@ diff -urNp linux-2.6.32.38/drivers/md/md.h linux-= 2.6.32.38/drivers/md/md.h } =20 struct mdk_personality -diff -urNp linux-2.6.32.38/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6= .32.38/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.32.38/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6= .32.39/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-17 15:56= :46.000000000 -0400 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -28089,9 +27487,9 @@ diff -urNp linux-2.6.32.38/drivers/media/dvb/dvb-= core/dvbdev.c linux-2.6.32.38/d struct file_operations *dvbdevfops; struct device *clsdev; int minor; -diff -urNp linux-2.6.32.38/drivers/media/radio/radio-cadet.c linux-2.6.3= 2.38/drivers/media/radio/radio-cadet.c ---- linux-2.6.32.38/drivers/media/radio/radio-cadet.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/media/radio/radio-cadet.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/media/radio/radio-cadet.c linux-2.6.3= 2.39/drivers/media/radio/radio-cadet.c +--- linux-2.6.32.39/drivers/media/radio/radio-cadet.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/media/radio/radio-cadet.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f while (i < count && dev->rdsin !=3D dev->rdsout) readbuf[i++] =3D dev->rdsbuf[dev->rdsout++]; @@ -28101,25 +27499,9 @@ diff -urNp linux-2.6.32.38/drivers/media/radio/r= adio-cadet.c linux-2.6.32.38/dri return -EFAULT; return i; } -diff -urNp linux-2.6.32.38/drivers/media/video/sn9c102/sn9c102_core.c li= nux-2.6.32.38/drivers/media/video/sn9c102/sn9c102_core.c ---- linux-2.6.32.38/drivers/media/video/sn9c102/sn9c102_core.c 2011-03-2= 7 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/media/video/sn9c102/sn9c102_core.c 2011-04-1= 7 15:56:46.000000000 -0400 -@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_ - sn9c102_show_i2c_reg, sn9c102_store_i2c_reg); - static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR, - sn9c102_show_i2c_val, sn9c102_store_i2c_val); --static DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green); --static DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue); --static DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red); -+static DEVICE_ATTR(green, S_IWUSR, NULL, sn9c102_store_green); -+static DEVICE_ATTR(blue, S_IWUSR, NULL, sn9c102_store_blue); -+static DEVICE_ATTR(red, S_IWUSR, NULL, sn9c102_store_red); - static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NU= LL); -=20 -=20 -diff -urNp linux-2.6.32.38/drivers/media/video/usbvideo/konicawc.c linux= -2.6.32.38/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.32.38/drivers/media/video/usbvideo/konicawc.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/media/video/usbvideo/konicawc.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c linux= -2.6.32.39/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; =20 @@ -28129,9 +27511,9 @@ diff -urNp linux-2.6.32.38/drivers/media/video/us= bvideo/konicawc.c linux-2.6.32. =20 cam->input =3D input_dev =3D input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messeng= er.c linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messenger.c ---- linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messenger.c 20= 11-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messenger.c 20= 11-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messeng= er.c linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c 20= 11-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c 20= 11-04-17 15:56:46.000000000 -0400 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; =20 @@ -28141,9 +27523,9 @@ diff -urNp linux-2.6.32.38/drivers/media/video/us= bvideo/quickcam_messenger.c lin =20 cam->input =3D input_dev =3D input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.38/drivers/message/fusion/mptbase.c linux-2.6.32= .38/drivers/message/fusion/mptbase.c ---- linux-2.6.32.38/drivers/message/fusion/mptbase.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/message/fusion/mptbase.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/message/fusion/mptbase.c linux-2.6.32= .39/drivers/message/fusion/mptbase.c +--- linux-2.6.32.39/drivers/message/fusion/mptbase.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/message/fusion/mptbase.c 2011-04-17 15:56:46= .000000000 -0400 @@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s len +=3D sprintf(buf+len, " MaxChainDepth =3D 0x%02x frames\n", ioc->= facts.MaxChainDepth); len +=3D sprintf(buf+len, " MinBlockSize =3D 0x%02x bytes\n", 4*ioc->= facts.BlockSize); @@ -28159,21 +27541,9 @@ diff -urNp linux-2.6.32.38/drivers/message/fusio= n/mptbase.c linux-2.6.32.38/driv /* * Rounding UP to nearest 4-kB boundary here... */ -diff -urNp linux-2.6.32.38/drivers/message/fusion/mptdebug.h linux-2.6.3= 2.38/drivers/message/fusion/mptdebug.h ---- linux-2.6.32.38/drivers/message/fusion/mptdebug.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/message/fusion/mptdebug.h 2011-04-17 15:56:4= 6.000000000 -0400 -@@ -71,7 +71,7 @@ - CMD; \ - } - #else --#define MPT_CHECK_LOGGING(IOC, CMD, BITS) -+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) - #endif -=20 -=20 -diff -urNp linux-2.6.32.38/drivers/message/fusion/mptsas.c linux-2.6.32.= 38/drivers/message/fusion/mptsas.c ---- linux-2.6.32.38/drivers/message/fusion/mptsas.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/message/fusion/mptsas.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/message/fusion/mptsas.c linux-2.6.32.= 39/drivers/message/fusion/mptsas.c +--- linux-2.6.32.39/drivers/message/fusion/mptsas.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/message/fusion/mptsas.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -28222,9 +27592,9 @@ diff -urNp linux-2.6.32.38/drivers/message/fusion= /mptsas.c linux-2.6.32.38/drive static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-2.6.32.38/drivers/message/fusion/mptscsih.c linux-2.6.3= 2.38/drivers/message/fusion/mptscsih.c ---- linux-2.6.32.38/drivers/message/fusion/mptscsih.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/message/fusion/mptscsih.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/message/fusion/mptscsih.c linux-2.6.3= 2.39/drivers/message/fusion/mptscsih.c +--- linux-2.6.32.39/drivers/message/fusion/mptscsih.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/message/fusion/mptscsih.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost) =20 h =3D shost_priv(SChost); @@ -28250,9 +27620,9 @@ diff -urNp linux-2.6.32.38/drivers/message/fusion= /mptscsih.c linux-2.6.32.38/dri =20 return h->info_kbuf; } -diff -urNp linux-2.6.32.38/drivers/message/i2o/i2o_proc.c linux-2.6.32.3= 8/drivers/message/i2o/i2o_proc.c ---- linux-2.6.32.38/drivers/message/i2o/i2o_proc.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/message/i2o/i2o_proc.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/drivers/message/i2o/i2o_proc.c linux-2.6.32.3= 9/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32.39/drivers/message/i2o/i2o_proc.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/drivers/message/i2o/i2o_proc.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -259,13 +259,6 @@ static char *scsi_devices[] =3D { "Array Controller Device" }; @@ -28339,9 +27709,9 @@ diff -urNp linux-2.6.32.38/drivers/message/i2o/i2= o_proc.c linux-2.6.32.38/driver =20 return 0; } -diff -urNp linux-2.6.32.38/drivers/misc/kgdbts.c linux-2.6.32.38/drivers= /misc/kgdbts.c ---- linux-2.6.32.38/drivers/misc/kgdbts.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/misc/kgdbts.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/misc/kgdbts.c linux-2.6.32.39/drivers= /misc/kgdbts.c +--- linux-2.6.32.39/drivers/misc/kgdbts.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/misc/kgdbts.c 2011-04-17 15:56:46.000000000 = -0400 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -28360,9 +27730,9 @@ diff -urNp linux-2.6.32.38/drivers/misc/kgdbts.c = linux-2.6.32.38/drivers/misc/kg .name =3D "kgdbts", .read_char =3D kgdbts_get_char, .write_char =3D kgdbts_put_char, -diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/gruhandles.c linux-2.6.3= 2.38/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.32.38/drivers/misc/sgi-gru/gruhandles.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c linux-2.6.3= 2.39/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic =20 static void update_mcs_stats(enum mcs_op op, unsigned long clks) @@ -28374,9 +27744,9 @@ diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/g= ruhandles.c linux-2.6.32.38/dri if (mcs_op_statistics[op].max < clks) mcs_op_statistics[op].max =3D clks; } -diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32= .38/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.32.38/drivers/misc/sgi-gru/gruprocfs.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32= .39/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:56:46= .000000000 -0400 @@ -32,9 +32,9 @@ =20 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -28400,9 +27770,9 @@ diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/g= ruprocfs.c linux-2.6.32.38/driv max =3D mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/grutables.h linux-2.6.32= .38/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.32.38/drivers/misc/sgi-gru/grutables.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h linux-2.6.32= .39/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:56:46= .000000000 -0400 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -28586,9 +27956,9 @@ diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/g= rutables.h linux-2.6.32.38/driv } while (0) =20 #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.32.38/drivers/mtd/devices/doc2000.c linux-2.6.32.38= /drivers/mtd/devices/doc2000.c ---- linux-2.6.32.38/drivers/mtd/devices/doc2000.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/mtd/devices/doc2000.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/mtd/devices/doc2000.c linux-2.6.32.39= /drivers/mtd/devices/doc2000.c +--- linux-2.6.32.39/drivers/mtd/devices/doc2000.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/mtd/devices/doc2000.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt =20 /* The ECC will not be calculated correctly if less than 512 is writt= en */ @@ -28598,9 +27968,9 @@ diff -urNp linux-2.6.32.38/drivers/mtd/devices/do= c2000.c linux-2.6.32.38/drivers printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.32.38/drivers/mtd/devices/doc2001.c linux-2.6.32.38= /drivers/mtd/devices/doc2001.c ---- linux-2.6.32.38/drivers/mtd/devices/doc2001.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/mtd/devices/doc2001.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/mtd/devices/doc2001.c linux-2.6.32.39= /drivers/mtd/devices/doc2001.c +--- linux-2.6.32.39/drivers/mtd/devices/doc2001.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/mtd/devices/doc2001.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip =3D &this->chips[from >> (this->chipshift)]; =20 @@ -28610,9 +27980,9 @@ diff -urNp linux-2.6.32.38/drivers/mtd/devices/do= c2001.c linux-2.6.32.38/drivers return -EINVAL; =20 /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.32.38/drivers/mtd/ubi/build.c linux-2.6.32.38/drive= rs/mtd/ubi/build.c ---- linux-2.6.32.38/drivers/mtd/ubi/build.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/mtd/ubi/build.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/mtd/ubi/build.c linux-2.6.32.39/drive= rs/mtd/ubi/build.c +--- linux-2.6.32.39/drivers/mtd/ubi/build.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/mtd/ubi/build.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -28652,9 +28022,9 @@ diff -urNp linux-2.6.32.38/drivers/mtd/ubi/build.= c linux-2.6.32.38/drivers/mtd/u } =20 /** -diff -urNp linux-2.6.32.38/drivers/net/e1000e/82571.c linux-2.6.32.38/dr= ivers/net/e1000e/82571.c ---- linux-2.6.32.38/drivers/net/e1000e/82571.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/net/e1000e/82571.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/e1000e/82571.c linux-2.6.32.39/dr= ivers/net/e1000e/82571.c +--- linux-2.6.32.39/drivers/net/e1000e/82571.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/net/e1000e/82571.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw =3D &adapter->hw; @@ -28708,9 +28078,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/825= 71.c linux-2.6.32.38/drivers/ne .acquire_nvm =3D e1000_acquire_nvm_82571, .read_nvm =3D e1000e_read_nvm_eerd, .release_nvm =3D e1000_release_nvm_82571, -diff -urNp linux-2.6.32.38/drivers/net/e1000e/e1000.h linux-2.6.32.38/dr= ivers/net/e1000e/e1000.h ---- linux-2.6.32.38/drivers/net/e1000e/e1000.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/net/e1000e/e1000.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/e1000e/e1000.h linux-2.6.32.39/dr= ivers/net/e1000e/e1000.h +--- linux-2.6.32.39/drivers/net/e1000e/e1000.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/net/e1000e/e1000.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -375,9 +375,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -28724,9 +28094,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/e10= 00.h linux-2.6.32.38/drivers/ne }; =20 /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.32.38/drivers/net/e1000e/es2lan.c linux-2.6.32.38/d= rivers/net/e1000e/es2lan.c ---- linux-2.6.32.38/drivers/net/e1000e/es2lan.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/net/e1000e/es2lan.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/e1000e/es2lan.c linux-2.6.32.39/d= rivers/net/e1000e/es2lan.c +--- linux-2.6.32.39/drivers/net/e1000e/es2lan.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/net/e1000e/es2lan.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw =3D &adapter->hw; @@ -28762,9 +28132,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/es2= lan.c linux-2.6.32.38/drivers/n .acquire_nvm =3D e1000_acquire_nvm_80003es2lan, .read_nvm =3D e1000e_read_nvm_eerd, .release_nvm =3D e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.32.38/drivers/net/e1000e/hw.h linux-2.6.32.38/drive= rs/net/e1000e/hw.h ---- linux-2.6.32.38/drivers/net/e1000e/hw.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/net/e1000e/hw.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/net/e1000e/hw.h linux-2.6.32.39/drive= rs/net/e1000e/hw.h +--- linux-2.6.32.39/drivers/net/e1000e/hw.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/net/e1000e/hw.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -756,34 +756,34 @@ struct e1000_mac_operations { =20 /* Function pointers for the PHY. */ @@ -28824,9 +28194,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/hw.= h linux-2.6.32.38/drivers/net/e }; =20 struct e1000_mac_info { -diff -urNp linux-2.6.32.38/drivers/net/e1000e/ich8lan.c linux-2.6.32.38/= drivers/net/e1000e/ich8lan.c ---- linux-2.6.32.38/drivers/net/e1000e/ich8lan.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/net/e1000e/ich8lan.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/e1000e/ich8lan.c linux-2.6.32.39/= drivers/net/e1000e/ich8lan.c +--- linux-2.6.32.39/drivers/net/e1000e/ich8lan.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/net/e1000e/ich8lan.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -28854,9 +28224,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/ich= 8lan.c linux-2.6.32.38/drivers/ .acquire_nvm =3D e1000_acquire_nvm_ich8lan, .read_nvm =3D e1000_read_nvm_ich8lan, .release_nvm =3D e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.32.38/drivers/net/ibmveth.c linux-2.6.32.38/drivers= /net/ibmveth.c ---- linux-2.6.32.38/drivers/net/ibmveth.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/net/ibmveth.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/net/ibmveth.c linux-2.6.32.39/drivers= /net/ibmveth.c +--- linux-2.6.32.39/drivers/net/ibmveth.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/net/ibmveth.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -28866,9 +28236,9 @@ diff -urNp linux-2.6.32.38/drivers/net/ibmveth.c = linux-2.6.32.38/drivers/net/ibm .show =3D veth_pool_show, .store =3D veth_pool_store, }; -diff -urNp linux-2.6.32.38/drivers/net/igb/e1000_82575.c linux-2.6.32.38= /drivers/net/igb/e1000_82575.c ---- linux-2.6.32.38/drivers/net/igb/e1000_82575.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/net/igb/e1000_82575.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/igb/e1000_82575.c linux-2.6.32.39= /drivers/net/igb/e1000_82575.c +--- linux-2.6.32.39/drivers/net/igb/e1000_82575.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/net/igb/e1000_82575.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct=20 wr32(E1000_VT_CTL, vt_ctl); } @@ -28894,9 +28264,9 @@ diff -urNp linux-2.6.32.38/drivers/net/igb/e1000_= 82575.c linux-2.6.32.38/drivers .acquire =3D igb_acquire_nvm_82575, .read =3D igb_read_nvm_eerd, .release =3D igb_release_nvm_82575, -diff -urNp linux-2.6.32.38/drivers/net/igb/e1000_hw.h linux-2.6.32.38/dr= ivers/net/igb/e1000_hw.h ---- linux-2.6.32.38/drivers/net/igb/e1000_hw.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/net/igb/e1000_hw.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/igb/e1000_hw.h linux-2.6.32.39/dr= ivers/net/igb/e1000_hw.h +--- linux-2.6.32.39/drivers/net/igb/e1000_hw.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/net/igb/e1000_hw.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -305,17 +305,17 @@ struct e1000_phy_operations { }; =20 @@ -28922,28 +28292,9 @@ diff -urNp linux-2.6.32.38/drivers/net/igb/e1000= _hw.h linux-2.6.32.38/drivers/ne }; =20 extern const struct e1000_info e1000_82575_info; -diff -urNp linux-2.6.32.38/drivers/net/irda/vlsi_ir.c linux-2.6.32.38/dr= ivers/net/irda/vlsi_ir.c ---- linux-2.6.32.38/drivers/net/irda/vlsi_ir.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/net/irda/vlsi_ir.c 2011-04-17 15:56:46.00000= 0000 -0400 -@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( - /* no race - tx-ring already empty */ - vlsi_set_baud(idev, iobase); - netif_wake_queue(ndev); -- } -- else -- ; -+ } else { - /* keep the speed change pending like it would - * for any len>0 packet. tx completion interrupt - * will apply it when the tx ring becomes empty. - */ -+ } - spin_unlock_irqrestore(&idev->lock, flags); - dev_kfree_skb_any(skb); - return NETDEV_TX_OK; -diff -urNp linux-2.6.32.38/drivers/net/iseries_veth.c linux-2.6.32.38/dr= ivers/net/iseries_veth.c ---- linux-2.6.32.38/drivers/net/iseries_veth.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/net/iseries_veth.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/iseries_veth.c linux-2.6.32.39/dr= ivers/net/iseries_veth.c +--- linux-2.6.32.39/drivers/net/iseries_veth.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/net/iseries_veth.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -28962,9 +28313,9 @@ diff -urNp linux-2.6.32.38/drivers/net/iseries_ve= th.c linux-2.6.32.38/drivers/ne .show =3D veth_port_attribute_show }; =20 -diff -urNp linux-2.6.32.38/drivers/net/pcnet32.c linux-2.6.32.38/drivers= /net/pcnet32.c ---- linux-2.6.32.38/drivers/net/pcnet32.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/net/pcnet32.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/net/pcnet32.c linux-2.6.32.39/drivers= /net/pcnet32.c +--- linux-2.6.32.39/drivers/net/pcnet32.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/net/pcnet32.c 2011-04-17 15:56:46.000000000 = -0400 @@ -79,7 +79,7 @@ static int cards_found; /* * VLB I/O addresses @@ -28974,9 +28325,9 @@ diff -urNp linux-2.6.32.38/drivers/net/pcnet32.c = linux-2.6.32.38/drivers/net/pcn { 0x300, 0x320, 0x340, 0x360, 0 }; =20 static int pcnet32_debug =3D 0; -diff -urNp linux-2.6.32.38/drivers/net/tg3.h linux-2.6.32.38/drivers/net= /tg3.h ---- linux-2.6.32.38/drivers/net/tg3.h 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/drivers/net/tg3.h 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/drivers/net/tg3.h linux-2.6.32.39/drivers/net= /tg3.h +--- linux-2.6.32.39/drivers/net/tg3.h 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/drivers/net/tg3.h 2011-04-17 15:56:46.000000000 -040= 0 @@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -28985,9 +28336,9 @@ diff -urNp linux-2.6.32.38/drivers/net/tg3.h linu= x-2.6.32.38/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.32.38/drivers/net/tulip/de4x5.c linux-2.6.32.38/dri= vers/net/tulip/de4x5.c ---- linux-2.6.32.38/drivers/net/tulip/de4x5.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/net/tulip/de4x5.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/tulip/de4x5.c linux-2.6.32.39/dri= vers/net/tulip/de4x5.c +--- linux-2.6.32.39/drivers/net/tulip/de4x5.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/net/tulip/de4x5.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=3D0; idev_addr[i]; @@ -29006,9 +28357,9 @@ diff -urNp linux-2.6.32.38/drivers/net/tulip/de4x= 5.c linux-2.6.32.38/drivers/net return -EFAULT; break; } -diff -urNp linux-2.6.32.38/drivers/net/usb/hso.c linux-2.6.32.38/drivers= /net/usb/hso.c ---- linux-2.6.32.38/drivers/net/usb/hso.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/net/usb/hso.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/net/usb/hso.c linux-2.6.32.39/drivers= /net/usb/hso.c +--- linux-2.6.32.39/drivers/net/usb/hso.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/net/usb/hso.c 2011-04-17 15:56:46.000000000 = -0400 @@ -71,7 +71,7 @@ #include #include @@ -29096,9 +28447,9 @@ diff -urNp linux-2.6.32.38/drivers/net/usb/hso.c = linux-2.6.32.38/drivers/net/usb result =3D hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.32.38/drivers/net/wireless/b43/debugfs.c linux-2.6.= 32.38/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.32.38/drivers/net/wireless/b43/debugfs.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c linux-2.6.= 32.39/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); @@ -29108,9 +28459,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/b= 43/debugfs.c linux-2.6.32.38/dr /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c linu= x-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c 2011-03-27 = 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 = 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c linu= x-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 = 15:56:46.000000000 -0400 @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize= ); @@ -29120,9 +28471,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/b= 43legacy/debugfs.c linux-2.6.32 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ -diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c linux= -2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c ---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c linux= -2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c +--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =3D=20 }, }; @@ -29132,9 +28483,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/i= wlwifi/iwl-1000.c linux-2.6.32. .ucode =3D &iwl5000_ucode, .lib =3D &iwl1000_lib, .hcmd =3D &iwl5000_hcmd, -diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c linux= -2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c linux= -2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd =3D iwl3945_build_addsta_hcmd, }; @@ -29144,9 +28495,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/i= wlwifi/iwl-3945.c linux-2.6.32. .ucode =3D &iwl3945_ucode, .lib =3D &iwl3945_lib, .hcmd =3D &iwl3945_hcmd, -diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c linux= -2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c linux= -2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =3D=20 }, }; @@ -29156,9 +28507,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/i= wlwifi/iwl-4965.c linux-2.6.32. .ucode =3D &iwl4965_ucode, .lib =3D &iwl4965_lib, .hcmd =3D &iwl4965_hcmd, -diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c linux= -2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c ---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c linux= -2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c +--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =3D=20 }, }; @@ -29176,9 +28527,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/i= wlwifi/iwl-5000.c linux-2.6.32. .ucode =3D &iwl5000_ucode, .lib =3D &iwl5150_lib, .hcmd =3D &iwl5000_hcmd, -diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c linux= -2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c ---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c linux= -2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi =3D iwl5000_calc_rssi, }; @@ -29188,9 +28539,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/i= wlwifi/iwl-6000.c linux-2.6.32. .ucode =3D &iwl5000_ucode, .lib =3D &iwl6000_lib, .hcmd =3D &iwl5000_hcmd, -diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h linu= x-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-27 = 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 = 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h linu= x-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 = 15:56:46.000000000 -0400 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri #endif =20 @@ -29202,9 +28553,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/i= wlwifi/iwl-debug.h linux-2.6.32 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, void *p, u32 len) {} -diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h linux-= 2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h ---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-04-17 15= :56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h linux-= 2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h +--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-04-17 15= :56:46.000000000 -0400 @@ -68,7 +68,7 @@ struct iwl_tx_queue; =20 /* shared structures from iwl-5000.c */ @@ -29214,9 +28565,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/i= wlwifi/iwl-dev.h linux-2.6.32.3 extern struct iwl_ucode_ops iwl5000_ucode; extern struct iwl_lib_ops iwl5000_lib; extern struct iwl_hcmd_ops iwl5000_hcmd; -diff -urNp linux-2.6.32.38/drivers/net/wireless/libertas/debugfs.c linux= -2.6.32.38/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.32.38/drivers/net/wireless/libertas/debugfs.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/libertas/debugfs.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c linux= -2.6.32.39/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -708,7 +708,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -29226,9 +28577,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/l= ibertas/debugfs.c linux-2.6.32. }; =20 static const struct lbs_debugfs_files debugfs_files[] =3D { -diff -urNp linux-2.6.32.38/drivers/net/wireless/rndis_wlan.c linux-2.6.3= 2.38/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.32.38/drivers/net/wireless/rndis_wlan.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c linux-2.6.3= 2.39/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn =20 devdbg(usbdev, "set_rts_threshold %i", rts_threshold); @@ -29238,9 +28589,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/r= ndis_wlan.c linux-2.6.32.38/dri rts_threshold =3D 2347; =20 tmp =3D cpu_to_le32(rts_threshold); -diff -urNp linux-2.6.32.38/drivers/oprofile/buffer_sync.c linux-2.6.32.3= 8/drivers/oprofile/buffer_sync.c ---- linux-2.6.32.38/drivers/oprofile/buffer_sync.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/oprofile/buffer_sync.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/drivers/oprofile/buffer_sync.c linux-2.6.32.3= 9/drivers/oprofile/buffer_sync.c +--- linux-2.6.32.39/drivers/oprofile/buffer_sync.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/drivers/oprofile/buffer_sync.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -341,7 +341,7 @@ static void add_data(struct op_entry *en if (cookie =3D=3D NO_COOKIE) offset =3D pc; @@ -29276,9 +28627,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/buffe= r_sync.c linux-2.6.32.38/driver } } release_mm(mm); -diff -urNp linux-2.6.32.38/drivers/oprofile/event_buffer.c linux-2.6.32.= 38/drivers/oprofile/event_buffer.c ---- linux-2.6.32.38/drivers/oprofile/event_buffer.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/oprofile/event_buffer.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/oprofile/event_buffer.c linux-2.6.32.= 39/drivers/oprofile/event_buffer.c +--- linux-2.6.32.39/drivers/oprofile/event_buffer.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/oprofile/event_buffer.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } =20 @@ -29288,9 +28639,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/event= _buffer.c linux-2.6.32.38/drive return; } =20 -diff -urNp linux-2.6.32.38/drivers/oprofile/oprof.c linux-2.6.32.38/driv= ers/oprofile/oprof.c ---- linux-2.6.32.38/drivers/oprofile/oprof.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/oprofile/oprof.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/oprofile/oprof.c linux-2.6.32.39/driv= ers/oprofile/oprof.c +--- linux-2.6.32.39/drivers/oprofile/oprof.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/oprofile/oprof.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -29300,9 +28651,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/oprof= .c linux-2.6.32.38/drivers/opro start_switch_worker(); } =20 -diff -urNp linux-2.6.32.38/drivers/oprofile/oprofilefs.c linux-2.6.32.38= /drivers/oprofile/oprofilefs.c ---- linux-2.6.32.38/drivers/oprofile/oprofilefs.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/oprofile/oprofilefs.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/oprofile/oprofilefs.c linux-2.6.32.39= /drivers/oprofile/oprofilefs.c +--- linux-2.6.32.39/drivers/oprofile/oprofilefs.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/oprofile/oprofilefs.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -187,7 +187,7 @@ static const struct file_operations atom =20 =20 @@ -29312,9 +28663,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/oprof= ilefs.c linux-2.6.32.38/drivers { struct dentry *d =3D __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.32.38/drivers/oprofile/oprofile_stats.c linux-2.6.3= 2.38/drivers/oprofile/oprofile_stats.c ---- linux-2.6.32.38/drivers/oprofile/oprofile_stats.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/oprofile/oprofile_stats.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/oprofile/oprofile_stats.c linux-2.6.3= 2.39/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32.39/drivers/oprofile/oprofile_stats.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/oprofile/oprofile_stats.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip =3D 0; } @@ -29332,9 +28683,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/oprof= ile_stats.c linux-2.6.32.38/dri } =20 =20 -diff -urNp linux-2.6.32.38/drivers/oprofile/oprofile_stats.h linux-2.6.3= 2.38/drivers/oprofile/oprofile_stats.h ---- linux-2.6.32.38/drivers/oprofile/oprofile_stats.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/oprofile/oprofile_stats.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/oprofile/oprofile_stats.h linux-2.6.3= 2.39/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32.39/drivers/oprofile/oprofile_stats.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/oprofile/oprofile_stats.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -13,11 +13,11 @@ #include =20 @@ -29352,9 +28703,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/oprof= ile_stats.h linux-2.6.32.38/dri }; =20 extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.32.38/drivers/parisc/pdc_stable.c linux-2.6.32.38/d= rivers/parisc/pdc_stable.c ---- linux-2.6.32.38/drivers/parisc/pdc_stable.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/parisc/pdc_stable.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/parisc/pdc_stable.c linux-2.6.32.39/d= rivers/parisc/pdc_stable.c +--- linux-2.6.32.39/drivers/parisc/pdc_stable.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/parisc/pdc_stable.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -29364,9 +28715,9 @@ diff -urNp linux-2.6.32.38/drivers/parisc/pdc_sta= ble.c linux-2.6.32.38/drivers/p .show =3D pdcspath_attr_show, .store =3D pdcspath_attr_store, }; -diff -urNp linux-2.6.32.38/drivers/parport/procfs.c linux-2.6.32.38/driv= ers/parport/procfs.c ---- linux-2.6.32.38/drivers/parport/procfs.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/parport/procfs.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/parport/procfs.c linux-2.6.32.39/driv= ers/parport/procfs.c +--- linux-2.6.32.39/drivers/parport/procfs.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/parport/procfs.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t =20 *ppos +=3D len; @@ -29385,9 +28736,9 @@ diff -urNp linux-2.6.32.38/drivers/parport/procfs= .c linux-2.6.32.38/drivers/parp } #endif /* IEEE1284.3 support. */ =20 -diff -urNp linux-2.6.32.38/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.= 32.38/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.32.38/drivers/pci/hotplug/acpiphp_glue.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.= 32.39/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } =20 @@ -29397,9 +28748,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/hotplug/ac= piphp_glue.c linux-2.6.32.38/dr .handler =3D handle_hotplug_event_func, }; =20 -diff -urNp linux-2.6.32.38/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.= 32.38/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.32.38/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.= 32.39/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ =20 void compaq_nvram_init (void __iomem *rom_start) @@ -29414,9 +28765,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/hotplug/cp= qphp_nvram.c linux-2.6.32.38/dr dbg("int15 entry =3D %p\n", compaq_int15_entry_point); =20 /* initialize our int15 lock */ -diff -urNp linux-2.6.32.38/drivers/pci/hotplug/fakephp.c linux-2.6.32.38= /drivers/pci/hotplug/fakephp.c ---- linux-2.6.32.38/drivers/pci/hotplug/fakephp.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/pci/hotplug/fakephp.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/pci/hotplug/fakephp.c linux-2.6.32.39= /drivers/pci/hotplug/fakephp.c +--- linux-2.6.32.39/drivers/pci/hotplug/fakephp.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/pci/hotplug/fakephp.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } =20 @@ -29426,9 +28777,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/hotplug/fa= kephp.c linux-2.6.32.38/drivers .store =3D legacy_store, .show =3D legacy_show }, .release =3D &legacy_release, -diff -urNp linux-2.6.32.38/drivers/pci/intel-iommu.c linux-2.6.32.38/dri= vers/pci/intel-iommu.c ---- linux-2.6.32.38/drivers/pci/intel-iommu.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/pci/intel-iommu.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/drivers/pci/intel-iommu.c linux-2.6.32.39/dri= vers/pci/intel-iommu.c +--- linux-2.6.32.39/drivers/pci/intel-iommu.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/drivers/pci/intel-iommu.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -2643,7 +2643,7 @@ error: return 0; } @@ -29498,9 +28849,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/intel-iomm= u.c linux-2.6.32.38/drivers/pci .alloc_coherent =3D intel_alloc_coherent, .free_coherent =3D intel_free_coherent, .map_sg =3D intel_map_sg, -diff -urNp linux-2.6.32.38/drivers/pci/pcie/aspm.c linux-2.6.32.38/drive= rs/pci/pcie/aspm.c ---- linux-2.6.32.38/drivers/pci/pcie/aspm.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/pci/pcie/aspm.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/pci/pcie/aspm.c linux-2.6.32.39/drive= rs/pci/pcie/aspm.c +--- linux-2.6.32.39/drivers/pci/pcie/aspm.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/pci/pcie/aspm.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -27,9 +27,9 @@ #define MODULE_PARAM_PREFIX "pcie_aspm." =20 @@ -29514,21 +28865,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/pcie/aspm= .c linux-2.6.32.38/drivers/pci/p #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) =20 -diff -urNp linux-2.6.32.38/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.3= 8/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.32.38/drivers/pci/pcie/portdrv_pci.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/pci/pcie/portdrv_pci.c 2011-04-17 15:56:46.0= 00000000 -0400 -@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru - static const struct pci_device_id port_pci_ids[] =3D { { - /* handle any PCI-Express port */ - PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0), -- }, { /* end: all zeroes */ } -+ }, { 0, 0, 0, 0, 0, 0, 0 } - }; - MODULE_DEVICE_TABLE(pci, port_pci_ids); -=20 -diff -urNp linux-2.6.32.38/drivers/pci/probe.c linux-2.6.32.38/drivers/p= ci/probe.c ---- linux-2.6.32.38/drivers/pci/probe.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/drivers/pci/probe.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/drivers/pci/probe.c linux-2.6.32.39/drivers/p= ci/probe.c +--- linux-2.6.32.39/drivers/pci/probe.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/drivers/pci/probe.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( return ret; } @@ -29546,9 +28885,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/probe.c li= nux-2.6.32.38/drivers/pci/probe struct device_attribute *attr, char *buf) { -diff -urNp linux-2.6.32.38/drivers/pci/proc.c linux-2.6.32.38/drivers/pc= i/proc.c ---- linux-2.6.32.38/drivers/pci/proc.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/pci/proc.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/pci/proc.c linux-2.6.32.39/drivers/pc= i/proc.c +--- linux-2.6.32.39/drivers/pci/proc.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/pci/proc.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -29566,9 +28905,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/proc.c lin= ux-2.6.32.38/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized =3D 1; -diff -urNp linux-2.6.32.38/drivers/pci/slot.c linux-2.6.32.38/drivers/pc= i/slot.c ---- linux-2.6.32.38/drivers/pci/slot.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/pci/slot.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/pci/slot.c linux-2.6.32.39/drivers/pc= i/slot.c +--- linux-2.6.32.39/drivers/pci/slot.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/pci/slot.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -29578,9 +28917,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/slot.c lin= ux-2.6.32.38/drivers/pci/slot.c .show =3D pci_slot_attr_show, .store =3D pci_slot_attr_store, }; -diff -urNp linux-2.6.32.38/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.38= /drivers/pcmcia/pcmcia_ioctl.c ---- linux-2.6.32.38/drivers/pcmcia/pcmcia_ioctl.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/pcmcia/pcmcia_ioctl.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.39= /drivers/pcmcia/pcmcia_ioctl.c +--- linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode return -EFAULT; } @@ -29590,33 +28929,9 @@ diff -urNp linux-2.6.32.38/drivers/pcmcia/pcmcia= _ioctl.c linux-2.6.32.38/drivers if (!buf) return -ENOMEM; =20 -diff -urNp linux-2.6.32.38/drivers/pcmcia/ti113x.h linux-2.6.32.38/drive= rs/pcmcia/ti113x.h ---- linux-2.6.32.38/drivers/pcmcia/ti113x.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/pcmcia/ti113x.h 2011-04-17 15:56:46.00000000= 0 -0400 -@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl - DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, - ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), -=20 -- {} -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus = *bus) -diff -urNp linux-2.6.32.38/drivers/pcmcia/yenta_socket.c linux-2.6.32.38= /drivers/pcmcia/yenta_socket.c ---- linux-2.6.32.38/drivers/pcmcia/yenta_socket.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/pcmcia/yenta_socket.c 2011-04-17 15:56:46.00= 0000000 -0400 -@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table=20 -=20 - /* match any cardbus bridge */ - CB_ID(PCI_ANY_ID, PCI_ANY_ID, DEFAULT), -- { /* all zeroes */ } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; - MODULE_DEVICE_TABLE(pci, yenta_table); -=20 -diff -urNp linux-2.6.32.38/drivers/platform/x86/acer-wmi.c linux-2.6.32.= 38/drivers/platform/x86/acer-wmi.c ---- linux-2.6.32.38/drivers/platform/x86/acer-wmi.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/acer-wmi.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/acer-wmi.c linux-2.6.32.= 39/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32.39/drivers/platform/x86/acer-wmi.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/acer-wmi.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -29626,9 +28941,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/a= cer-wmi.c linux-2.6.32.38/drive .get_brightness =3D read_brightness, .update_status =3D update_bl_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/asus_acpi.c linux-2.6.32= .38/drivers/platform/x86/asus_acpi.c ---- linux-2.6.32.38/drivers/platform/x86/asus_acpi.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/asus_acpi.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/asus_acpi.c linux-2.6.32= .39/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32.39/drivers/platform/x86/asus_acpi.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/asus_acpi.c 2011-04-17 15:56:46= .000000000 -0400 @@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -29638,9 +28953,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/a= sus_acpi.c linux-2.6.32.38/driv .get_brightness =3D read_brightness, .update_status =3D set_brightness_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/asus-laptop.c linux-2.6.= 32.38/drivers/platform/x86/asus-laptop.c ---- linux-2.6.32.38/drivers/platform/x86/asus-laptop.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/asus-laptop.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/asus-laptop.c linux-2.6.= 32.39/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32.39/drivers/platform/x86/asus-laptop.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/asus-laptop.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac */ static int read_brightness(struct backlight_device *bd); @@ -29650,9 +28965,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/a= sus-laptop.c linux-2.6.32.38/dr .get_brightness =3D read_brightness, .update_status =3D update_bl_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/compal-laptop.c linux-2.= 6.32.38/drivers/platform/x86/compal-laptop.c ---- linux-2.6.32.38/drivers/platform/x86/compal-laptop.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/compal-laptop.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/compal-laptop.c linux-2.= 6.32.39/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32.39/drivers/platform/x86/compal-laptop.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/compal-laptop.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -29662,9 +28977,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/c= ompal-laptop.c linux-2.6.32.38/ .get_brightness =3D bl_get_brightness, .update_status =3D bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/dell-laptop.c linux-2.6.= 32.38/drivers/platform/x86/dell-laptop.c ---- linux-2.6.32.38/drivers/platform/x86/dell-laptop.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/dell-laptop.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/dell-laptop.c linux-2.6.= 32.39/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32.39/drivers/platform/x86/dell-laptop.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/dell-laptop.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -29674,9 +28989,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/d= ell-laptop.c linux-2.6.32.38/dr .get_brightness =3D dell_get_intensity, .update_status =3D dell_send_intensity, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/eeepc-laptop.c linux-2.6= .32.38/drivers/platform/x86/eeepc-laptop.c ---- linux-2.6.32.38/drivers/platform/x86/eeepc-laptop.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/eeepc-laptop.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c linux-2.6= .32.39/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c 2011-04-17 15:56= :46.000000000 -0400 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device */ static int read_brightness(struct backlight_device *bd); @@ -29686,9 +29001,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/e= eepc-laptop.c linux-2.6.32.38/d .get_brightness =3D read_brightness, .update_status =3D update_bl_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/fujitsu-laptop.c linux-2= .6.32.38/drivers/platform/x86/fujitsu-laptop.c ---- linux-2.6.32.38/drivers/platform/x86/fujitsu-laptop.c 2011-03-27 14:= 31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/fujitsu-laptop.c 2011-04-17 15:= 56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c linux-2= .6.32.39/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c 2011-04-17 15:= 56:46.000000000 -0400 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -29698,9 +29013,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/f= ujitsu-laptop.c linux-2.6.32.38 .get_brightness =3D bl_get_brightness, .update_status =3D bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/msi-laptop.c linux-2.6.3= 2.38/drivers/platform/x86/msi-laptop.c ---- linux-2.6.32.38/drivers/platform/x86/msi-laptop.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/msi-laptop.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/msi-laptop.c linux-2.6.3= 2.39/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32.39/drivers/platform/x86/msi-laptop.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/msi-laptop.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -29710,9 +29025,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/m= si-laptop.c linux-2.6.32.38/dri .get_brightness =3D bl_get_brightness, .update_status =3D bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/panasonic-laptop.c linux= -2.6.32.38/drivers/platform/x86/panasonic-laptop.c ---- linux-2.6.32.38/drivers/platform/x86/panasonic-laptop.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/panasonic-laptop.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c linux= -2.6.32.39/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -29722,9 +29037,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/p= anasonic-laptop.c linux-2.6.32. .get_brightness =3D bl_get, .update_status =3D bl_set_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/sony-laptop.c linux-2.6.= 32.38/drivers/platform/x86/sony-laptop.c ---- linux-2.6.32.38/drivers/platform/x86/sony-laptop.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/sony-laptop.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/sony-laptop.c linux-2.6.= 32.39/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32.39/drivers/platform/x86/sony-laptop.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/sony-laptop.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } =20 @@ -29734,9 +29049,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/s= ony-laptop.c linux-2.6.32.38/dr .update_status =3D sony_backlight_update_status, .get_brightness =3D sony_backlight_get_brightness, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/thinkpad_acpi.c linux-2.= 6.32.38/drivers/platform/x86/thinkpad_acpi.c ---- linux-2.6.32.38/drivers/platform/x86/thinkpad_acpi.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/thinkpad_acpi.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c linux-2.= 6.32.39/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha BACKLIGHT_UPDATE_HOTKEY); } @@ -29746,9 +29061,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/t= hinkpad_acpi.c linux-2.6.32.38/ .get_brightness =3D brightness_get, .update_status =3D brightness_update_status, }; -diff -urNp linux-2.6.32.38/drivers/platform/x86/toshiba_acpi.c linux-2.6= .32.38/drivers/platform/x86/toshiba_acpi.c ---- linux-2.6.32.38/drivers/platform/x86/toshiba_acpi.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/platform/x86/toshiba_acpi.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c linux-2.6= .32.39/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c 2011-04-17 15:56= :46.000000000 -0400 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -29758,9 +29073,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/t= oshiba_acpi.c linux-2.6.32.38/d .get_brightness =3D get_lcd, .update_status =3D set_lcd_status, }; -diff -urNp linux-2.6.32.38/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.= 38/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.32.38/drivers/pnp/pnpbios/bioscalls.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.= 39/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -60,7 +60,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -29817,21 +29132,9 @@ diff -urNp linux-2.6.32.38/drivers/pnp/pnpbios/b= ioscalls.c linux-2.6.32.38/drive + + pax_close_kernel(); } -diff -urNp linux-2.6.32.38/drivers/pnp/quirks.c linux-2.6.32.38/drivers/= pnp/quirks.c ---- linux-2.6.32.38/drivers/pnp/quirks.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/drivers/pnp/quirks.c 2011-04-17 15:56:46.000000000 -= 0400 -@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] =3D { - /* PnP resources that might overlap PCI BARs */ - {"PNP0c01", quirk_system_pci_resources}, - {"PNP0c02", quirk_system_pci_resources}, -- {""} -+ {"", NULL} - }; -=20 - void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.32.38/drivers/pnp/resource.c linux-2.6.32.38/driver= s/pnp/resource.c ---- linux-2.6.32.38/drivers/pnp/resource.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/pnp/resource.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/pnp/resource.c linux-2.6.32.39/driver= s/pnp/resource.c +--- linux-2.6.32.39/drivers/pnp/resource.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/pnp/resource.c 2011-04-17 15:56:46.000000000= -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; =20 @@ -29850,9 +29153,9 @@ diff -urNp linux-2.6.32.38/drivers/pnp/resource.c= linux-2.6.32.38/drivers/pnp/re return 0; =20 /* check if the resource is reserved */ -diff -urNp linux-2.6.32.38/drivers/rtc/rtc-dev.c linux-2.6.32.38/drivers= /rtc/rtc-dev.c ---- linux-2.6.32.38/drivers/rtc/rtc-dev.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/rtc/rtc-dev.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/rtc/rtc-dev.c linux-2.6.32.39/drivers= /rtc/rtc-dev.c +--- linux-2.6.32.39/drivers/rtc/rtc-dev.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/rtc/rtc-dev.c 2011-04-17 15:56:46.000000000 = -0400 @@ -14,6 +14,7 @@ #include #include @@ -29870,9 +29173,9 @@ diff -urNp linux-2.6.32.38/drivers/rtc/rtc-dev.c = linux-2.6.32.38/drivers/rtc/rtc return rtc_set_time(rtc, &tm); =20 case RTC_PIE_ON: -diff -urNp linux-2.6.32.38/drivers/s390/cio/qdio_perf.c linux-2.6.32.38/= drivers/s390/cio/qdio_perf.c ---- linux-2.6.32.38/drivers/s390/cio/qdio_perf.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/s390/cio/qdio_perf.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/s390/cio/qdio_perf.c linux-2.6.32.39/= drivers/s390/cio/qdio_perf.c +--- linux-2.6.32.39/drivers/s390/cio/qdio_perf.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/s390/cio/qdio_perf.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ static int qdio_perf_proc_show(struct seq_file *m, void *v) { @@ -29948,9 +29251,9 @@ diff -urNp linux-2.6.32.38/drivers/s390/cio/qdio_= perf.c linux-2.6.32.38/drivers/ seq_printf(m, "\n"); return 0; } -diff -urNp linux-2.6.32.38/drivers/s390/cio/qdio_perf.h linux-2.6.32.38/= drivers/s390/cio/qdio_perf.h ---- linux-2.6.32.38/drivers/s390/cio/qdio_perf.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/s390/cio/qdio_perf.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/s390/cio/qdio_perf.h linux-2.6.32.39/= drivers/s390/cio/qdio_perf.h +--- linux-2.6.32.39/drivers/s390/cio/qdio_perf.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/s390/cio/qdio_perf.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -13,46 +13,46 @@ =20 struct qdio_perf_stats { @@ -30023,9 +29326,9 @@ diff -urNp linux-2.6.32.38/drivers/s390/cio/qdio_= perf.h linux-2.6.32.38/drivers/ } =20 int qdio_setup_perf_stats(void); -diff -urNp linux-2.6.32.38/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6= .32.38/drivers/scsi/aic94xx/aic94xx_init.c ---- linux-2.6.32.38/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6= .32.39/drivers/scsi/aic94xx/aic94xx_init.c +--- linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:56= :46.000000000 -0400 @@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru flash_error_table[i].reason); } @@ -30035,9 +29338,9 @@ diff -urNp linux-2.6.32.38/drivers/scsi/aic94xx/a= ic94xx_init.c linux-2.6.32.38/d asd_show_update_bios, asd_store_update_bios); =20 static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) -diff -urNp linux-2.6.32.38/drivers/scsi/ipr.c linux-2.6.32.38/drivers/sc= si/ipr.c ---- linux-2.6.32.38/drivers/scsi/ipr.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/drivers/scsi/ipr.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/drivers/scsi/ipr.c linux-2.6.32.39/drivers/sc= si/ipr.c +--- linux-2.6.32.39/drivers/scsi/ipr.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/drivers/scsi/ipr.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -30047,9 +29350,9 @@ diff -urNp linux-2.6.32.38/drivers/scsi/ipr.c lin= ux-2.6.32.38/drivers/scsi/ipr.c .phy_reset =3D ipr_ata_phy_reset, .hardreset =3D ipr_sata_reset, .post_internal_cmd =3D ipr_ata_post_internal, -diff -urNp linux-2.6.32.38/drivers/scsi/libfc/fc_exch.c linux-2.6.32.38/= drivers/scsi/libfc/fc_exch.c ---- linux-2.6.32.38/drivers/scsi/libfc/fc_exch.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/scsi/libfc/fc_exch.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c linux-2.6.32.39/= drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -30171,10 +29474,10 @@ diff -urNp linux-2.6.32.38/drivers/scsi/libfc/f= c_exch.c linux-2.6.32.38/drivers/ =20 fc_frame_free(fp); } -diff -urNp linux-2.6.32.38/drivers/scsi/libsas/sas_ata.c linux-2.6.32.38= /drivers/scsi/libsas/sas_ata.c ---- linux-2.6.32.38/drivers/scsi/libsas/sas_ata.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/scsi/libsas/sas_ata.c 2011-04-17 15:56:46.00= 0000000 -0400 -@@ -343,10 +343,10 @@ static int sas_ata_scr_read(struct ata_l +diff -urNp linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c linux-2.6.32.39= /drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c 2011-04-23 12:56:11.00= 0000000 -0400 +@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } =20 @@ -30182,38 +29485,10 @@ diff -urNp linux-2.6.32.38/drivers/scsi/libsas/= sas_ata.c linux-2.6.32.38/drivers +static const struct ata_port_operations sas_sata_ops =3D { .phy_reset =3D sas_ata_phy_reset, .post_internal_cmd =3D sas_ata_post_internal, -- .qc_defer =3D ata_std_qc_defer, -+ .qc_defer =3D ata_std_qc_defer, - .qc_prep =3D ata_noop_qc_prep, - .qc_issue =3D sas_ata_qc_issue, - .qc_fill_rtf =3D sas_ata_qc_fill_rtf, -diff -urNp linux-2.6.32.38/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.= 6.32.38/drivers/scsi/mpt2sas/mpt2sas_debug.h ---- linux-2.6.32.38/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-04-17 15:5= 6:46.000000000 -0400 -@@ -79,7 +79,7 @@ - CMD; \ - } - #else --#define MPT_CHECK_LOGGING(IOC, CMD, BITS) -+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) - #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ -=20 -=20 -diff -urNp linux-2.6.32.38/drivers/scsi/scsi_logging.h linux-2.6.32.38/d= rivers/scsi/scsi_logging.h ---- linux-2.6.32.38/drivers/scsi/scsi_logging.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/scsi/scsi_logging.h 2011-04-17 15:56:46.0000= 00000 -0400 -@@ -51,7 +51,7 @@ do { \ - } while (0); \ - } while (0) - #else --#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) -+#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) do {} while (0) - #endif /* CONFIG_SCSI_LOGGING */ -=20 - /* -diff -urNp linux-2.6.32.38/drivers/scsi/sg.c linux-2.6.32.38/drivers/scs= i/sg.c ---- linux-2.6.32.38/drivers/scsi/sg.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/drivers/scsi/sg.c 2011-04-17 15:56:46.000000000 -040= 0 + .qc_defer =3D ata_std_qc_defer, +diff -urNp linux-2.6.32.39/drivers/scsi/sg.c linux-2.6.32.39/drivers/scs= i/sg.c +--- linux-2.6.32.39/drivers/scsi/sg.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/drivers/scsi/sg.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -30232,21 +29507,9 @@ diff -urNp linux-2.6.32.38/drivers/scsi/sg.c lin= ux-2.6.32.38/drivers/scsi/sg.c =20 sg_proc_sgp =3D proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.32.38/drivers/serial/8250_pci.c linux-2.6.32.38/dri= vers/serial/8250_pci.c ---- linux-2.6.32.38/drivers/serial/8250_pci.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/serial/8250_pci.c 2011-04-17 15:56:46.000000= 000 -0400 -@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t - PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, - 0xffff00, pbn_default }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - static struct pci_driver serial_pci_driver =3D { -diff -urNp linux-2.6.32.38/drivers/serial/kgdboc.c linux-2.6.32.38/drive= rs/serial/kgdboc.c ---- linux-2.6.32.38/drivers/serial/kgdboc.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/serial/kgdboc.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/serial/kgdboc.c linux-2.6.32.39/drive= rs/serial/kgdboc.c +--- linux-2.6.32.39/drivers/serial/kgdboc.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/serial/kgdboc.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -18,7 +18,7 @@ =20 #define MAX_CONFIG_LEN 40 @@ -30265,9 +29528,9 @@ diff -urNp linux-2.6.32.38/drivers/serial/kgdboc.= c linux-2.6.32.38/drivers/seria .name =3D "kgdboc", .read_char =3D kgdboc_get_char, .write_char =3D kgdboc_put_char, -diff -urNp linux-2.6.32.38/drivers/staging/android/binder.c linux-2.6.32= .38/drivers/staging/android/binder.c ---- linux-2.6.32.38/drivers/staging/android/binder.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/android/binder.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/android/binder.c linux-2.6.32= .39/drivers/staging/android/binder.c +--- linux-2.6.32.39/drivers/staging/android/binder.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/android/binder.c 2011-04-17 15:56:46= .000000000 -0400 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -30277,9 +29540,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/androi= d/binder.c linux-2.6.32.38/driv .open =3D binder_vma_open, .close =3D binder_vma_close, }; -diff -urNp linux-2.6.32.38/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.38= /drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.32.38/drivers/staging/b3dfg/b3dfg.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/staging/b3dfg/b3dfg.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.39= /drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -30298,9 +29561,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/b3dfg/= b3dfg.c linux-2.6.32.38/drivers .owner =3D THIS_MODULE, .open =3D b3dfg_open, .release =3D b3dfg_release, -diff -urNp linux-2.6.32.38/drivers/staging/comedi/comedi_fops.c linux-2.= 6.32.38/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.32.38/drivers/staging/comedi/comedi_fops.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/comedi/comedi_fops.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c linux-2.= 6.32.39/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct=20 mutex_unlock(&dev->mutex); } @@ -30310,9 +29573,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/comedi= /comedi_fops.c linux-2.6.32.38/ .close =3D comedi_unmap, }; =20 -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c lin= ux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c 2011-03-27= 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c 2011-04-17= 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c lin= ux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c 2011-04-17= 15:56:46.000000000 -0400 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi static dev_t adsp_devno; static struct class *adsp_class; @@ -30322,9 +29585,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/adsp_driver.c linux-2.6.3 .owner =3D THIS_MODULE, .open =3D adsp_open, .unlocked_ioctl =3D adsp_ioctl, -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c linux= -2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c linux= -2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -1022,7 +1022,7 @@ done: return rc; } @@ -30334,9 +29597,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/audio_aac.c linux-2.6.32. .owner =3D THIS_MODULE, .open =3D audio_open, .release =3D audio_release, -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c lin= ux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-03-27= 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-04-17= 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c lin= ux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-04-17= 15:56:46.000000000 -0400 @@ -833,7 +833,7 @@ done: return rc; } @@ -30346,9 +29609,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/audio_amrnb.c linux-2.6.3 .owner =3D THIS_MODULE, .open =3D audamrnb_open, .release =3D audamrnb_release, -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c linu= x-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c 2011-03-27 = 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c 2011-04-17 = 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c linu= x-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c 2011-04-17 = 15:56:46.000000000 -0400 @@ -805,7 +805,7 @@ dma_fail: return rc; } @@ -30358,9 +29621,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/audio_evrc.c linux-2.6.32 .owner =3D THIS_MODULE, .open =3D audevrc_open, .release =3D audevrc_release, -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c linux-= 2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c 2011-04-17 15= :56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c linux-= 2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c 2011-04-17 15= :56:46.000000000 -0400 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino return 0; } @@ -30379,9 +29642,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/audio_in.c linux-2.6.32.3 .owner =3D THIS_MODULE, .open =3D audpre_open, .unlocked_ioctl =3D audpre_ioctl, -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c linux= -2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c linux= -2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -941,7 +941,7 @@ done: return rc; } @@ -30391,9 +29654,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/audio_mp3.c linux-2.6.32. .owner =3D THIS_MODULE, .open =3D audio_open, .release =3D audio_release, -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c linux= -2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c linux= -2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod return 0; } @@ -30412,9 +29675,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/audio_out.c linux-2.6.32. .owner =3D THIS_MODULE, .open =3D audpp_open, .unlocked_ioctl =3D audpp_ioctl, -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c lin= ux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-03-27= 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-04-17= 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c lin= ux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-04-17= 15:56:46.000000000 -0400 @@ -816,7 +816,7 @@ err: return rc; } @@ -30424,9 +29687,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/audio_qcelp.c linux-2.6.3 .owner =3D THIS_MODULE, .open =3D audqcelp_open, .release =3D audqcelp_release, -diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/snd.c linux-2.6.3= 2.38/drivers/staging/dream/qdsp5/snd.c ---- linux-2.6.32.38/drivers/staging/dream/qdsp5/snd.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/snd.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c linux-2.6.3= 2.39/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -242,7 +242,7 @@ err: return rc; } @@ -30436,9 +29699,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= qdsp5/snd.c linux-2.6.32.38/dri .owner =3D THIS_MODULE, .open =3D snd_open, .release =3D snd_release, -diff -urNp linux-2.6.32.38/drivers/staging/dream/smd/smd_qmi.c linux-2.6= .32.38/drivers/staging/dream/smd/smd_qmi.c ---- linux-2.6.32.38/drivers/staging/dream/smd/smd_qmi.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/smd/smd_qmi.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c linux-2.6= .32.39/drivers/staging/dream/smd/smd_qmi.c +--- linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c 2011-04-17 15:56= :46.000000000 -0400 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, return 0; } @@ -30448,9 +29711,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= smd/smd_qmi.c linux-2.6.32.38/d .owner =3D THIS_MODULE, .read =3D qmi_read, .write =3D qmi_write, -diff -urNp linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_devic= e.c linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_device.c ---- linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_device.c 201= 1-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_device.c 201= 1-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_devic= e.c linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c +--- linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c 201= 1-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c 201= 1-04-17 15:56:46.000000000 -0400 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file=20 return rc; } @@ -30469,9 +29732,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/= smd/smd_rpcrouter_device.c linu .owner =3D THIS_MODULE, .open =3D rpcrouter_open, .release =3D rpcrouter_release, -diff -urNp linux-2.6.32.38/drivers/staging/dst/dcore.c linux-2.6.32.38/d= rivers/staging/dst/dcore.c ---- linux-2.6.32.38/drivers/staging/dst/dcore.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/staging/dst/dcore.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dst/dcore.c linux-2.6.32.39/d= rivers/staging/dst/dcore.c +--- linux-2.6.32.39/drivers/staging/dst/dcore.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/staging/dst/dcore.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi return 0; } @@ -30490,9 +29753,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dst/dc= ore.c linux-2.6.32.38/drivers/s snprintf(n->name, sizeof(n->name), "%s", ctl->name); =20 err =3D dst_node_sysfs_init(n); -diff -urNp linux-2.6.32.38/drivers/staging/dst/trans.c linux-2.6.32.38/d= rivers/staging/dst/trans.c ---- linux-2.6.32.38/drivers/staging/dst/trans.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/staging/dst/trans.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/dst/trans.c linux-2.6.32.39/d= rivers/staging/dst/trans.c +--- linux-2.6.32.39/drivers/staging/dst/trans.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/staging/dst/trans.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,=20 t->error =3D 0; t->retries =3D 0; @@ -30502,9 +29765,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dst/tr= ans.c linux-2.6.32.38/drivers/s =20 t->enc =3D bio_data_dir(bio); dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); -diff -urNp linux-2.6.32.38/drivers/staging/go7007/go7007-v4l2.c linux-2.= 6.32.38/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.32.38/drivers/staging/go7007/go7007-v4l2.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c linux-2.= 6.32.39/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -30514,9 +29777,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/go7007= /go7007-v4l2.c linux-2.6.32.38/ .open =3D go7007_vm_open, .close =3D go7007_vm_close, .fault =3D go7007_vm_fault, -diff -urNp linux-2.6.32.38/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.= 38/drivers/staging/hv/blkvsc_drv.c ---- linux-2.6.32.38/drivers/staging/hv/blkvsc_drv.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/hv/blkvsc_drv.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.= 39/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size =3D BLKV /* The one and only one */ static struct blkvsc_driver_context g_blkvsc_drv; @@ -30526,9 +29789,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/hv/blk= vsc_drv.c linux-2.6.32.38/drive .owner =3D THIS_MODULE, .open =3D blkvsc_open, .release =3D blkvsc_release, -diff -urNp linux-2.6.32.38/drivers/staging/hv/Hv.c linux-2.6.32.38/drive= rs/staging/hv/Hv.c ---- linux-2.6.32.38/drivers/staging/hv/Hv.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/staging/hv/Hv.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/hv/Hv.c linux-2.6.32.39/drive= rs/staging/hv/Hv.c +--- linux-2.6.32.39/drivers/staging/hv/Hv.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/staging/hv/Hv.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo u64 outputAddress =3D (Output) ? virt_to_phys(Output) : 0; u32 outputAddressHi =3D outputAddress >> 32; @@ -30538,9 +29801,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/hv/Hv.= c linux-2.6.32.38/drivers/stagi =20 DPRINT_DBG(VMBUS, "Hypercall ", Control, Input, Output); -diff -urNp linux-2.6.32.38/drivers/staging/panel/panel.c linux-2.6.32.38= /drivers/staging/panel/panel.c ---- linux-2.6.32.38/drivers/staging/panel/panel.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/staging/panel/panel.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/panel/panel.c linux-2.6.32.39= /drivers/staging/panel/panel.c +--- linux-2.6.32.39/drivers/staging/panel/panel.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/staging/panel/panel.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -30559,9 +29822,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/panel/= panel.c linux-2.6.32.38/drivers .read =3D keypad_read, /* read */ .open =3D keypad_open, /* open */ .release =3D keypad_release, /* close */ -diff -urNp linux-2.6.32.38/drivers/staging/phison/phison.c linux-2.6.32.= 38/drivers/staging/phison/phison.c ---- linux-2.6.32.38/drivers/staging/phison/phison.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/phison/phison.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/phison/phison.c linux-2.6.32.= 39/drivers/staging/phison/phison.c +--- linux-2.6.32.39/drivers/staging/phison/phison.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/phison/phison.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -30571,9 +29834,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/phison= /phison.c linux-2.6.32.38/drive .inherits =3D &ata_bmdma_port_ops, .prereset =3D phison_pre_reset, }; -diff -urNp linux-2.6.32.38/drivers/staging/poch/poch.c linux-2.6.32.38/d= rivers/staging/poch/poch.c ---- linux-2.6.32.38/drivers/staging/poch/poch.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/staging/poch/poch.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/poch/poch.c linux-2.6.32.39/d= rivers/staging/poch/poch.c +--- linux-2.6.32.39/drivers/staging/poch/poch.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/staging/poch/poch.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -30583,9 +29846,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/poch/p= och.c linux-2.6.32.38/drivers/s .owner =3D THIS_MODULE, .open =3D poch_open, .release =3D poch_release, -diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/inode.c linux-2.6.32= .38/drivers/staging/pohmelfs/inode.c ---- linux-2.6.32.38/drivers/staging/pohmelfs/inode.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/pohmelfs/inode.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/inode.c linux-2.6.32= .39/drivers/staging/pohmelfs/inode.c +--- linux-2.6.32.39/drivers/staging/pohmelfs/inode.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/pohmelfs/inode.c 2011-04-17 15:56:46= .000000000 -0400 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root =3D RB_ROOT; @@ -30595,9 +29858,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/pohmel= fs/inode.c linux-2.6.32.38/driv =20 psb->trans_max_pages =3D 100; =20 -diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/mcache.c linux-2.6.3= 2.38/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.32.38/drivers/staging/pohmelfs/mcache.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c linux-2.6.3= 2.39/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data =3D data; m->start =3D start; @@ -30607,9 +29870,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/pohmel= fs/mcache.c linux-2.6.32.38/dri =20 mutex_lock(&psb->mcache_lock); err =3D pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/netfs.h linux-2.6.32= .38/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.32.38/drivers/staging/pohmelfs/netfs.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/pohmelfs/netfs.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h linux-2.6.32= .39/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h 2011-04-17 15:56:46= .000000000 -0400 @@ -570,7 +570,7 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -30619,9 +29882,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/pohmel= fs/netfs.h linux-2.6.32.38/driv unsigned long mcache_timeout; =20 unsigned int idx; -diff -urNp linux-2.6.32.38/drivers/staging/sep/sep_driver.c linux-2.6.32= .38/drivers/staging/sep/sep_driver.c ---- linux-2.6.32.38/drivers/staging/sep/sep_driver.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/sep/sep_driver.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/sep/sep_driver.c linux-2.6.32= .39/drivers/staging/sep/sep_driver.c +--- linux-2.6.32.39/drivers/staging/sep/sep_driver.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/sep/sep_driver.c 2011-04-17 15:56:46= .000000000 -0400 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver=20 static dev_t sep_devno; =20 @@ -30631,9 +29894,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/sep/se= p_driver.c linux-2.6.32.38/driv .owner =3D THIS_MODULE, .ioctl =3D sep_ioctl, .poll =3D sep_poll, -diff -urNp linux-2.6.32.38/drivers/staging/vme/devices/vme_user.c linux-= 2.6.32.38/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.32.38/drivers/staging/vme/devices/vme_user.c 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/staging/vme/devices/vme_user.c 2011-04-17 15= :56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c linux-= 2.6.32.39/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c 2011-04-17 15= :56:46.000000000 -0400 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * static int __init vme_user_probe(struct device *, int, int); static int __exit vme_user_remove(struct device *, int, int); @@ -30643,9 +29906,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/vme/de= vices/vme_user.c linux-2.6.32.3 .open =3D vme_user_open, .release =3D vme_user_release, .read =3D vme_user_read, -diff -urNp linux-2.6.32.38/drivers/uio/uio.c linux-2.6.32.38/drivers/uio= /uio.c ---- linux-2.6.32.38/drivers/uio/uio.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/drivers/uio/uio.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/drivers/uio/uio.c linux-2.6.32.39/drivers/uio= /uio.c +--- linux-2.6.32.39/drivers/uio/uio.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/drivers/uio/uio.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -23,6 +23,7 @@ #include #include @@ -30697,9 +29960,9 @@ diff -urNp linux-2.6.32.38/drivers/uio/uio.c linu= x-2.6.32.38/drivers/uio/uio.c } =20 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *v= mf) -diff -urNp linux-2.6.32.38/drivers/usb/atm/usbatm.c linux-2.6.32.38/driv= ers/usb/atm/usbatm.c ---- linux-2.6.32.38/drivers/usb/atm/usbatm.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/drivers/usb/atm/usbatm.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/drivers/usb/atm/usbatm.c linux-2.6.32.39/driv= ers/usb/atm/usbatm.c +--- linux-2.6.32.39/drivers/usb/atm/usbatm.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/drivers/usb/atm/usbatm.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -30779,21 +30042,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/atm/usbat= m.c linux-2.6.32.38/drivers/usb/ =20 if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.32.38/drivers/usb/class/cdc-acm.c linux-2.6.32.38/d= rivers/usb/class/cdc-acm.c ---- linux-2.6.32.38/drivers/usb/class/cdc-acm.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/usb/class/cdc-acm.c 2011-04-17 15:56:46.0000= 00000 -0400 -@@ -1624,7 +1624,7 @@ static struct usb_device_id acm_ids[] =3D=20 - { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, - USB_CDC_ACM_PROTO_AT_CDMA) }, -=20 -- { } -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.32.38/drivers/usb/class/cdc-wdm.c linux-2.6.32.38/d= rivers/usb/class/cdc-wdm.c ---- linux-2.6.32.38/drivers/usb/class/cdc-wdm.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/usb/class/cdc-wdm.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/usb/class/cdc-wdm.c linux-2.6.32.39/d= rivers/usb/class/cdc-wdm.c +--- linux-2.6.32.39/drivers/usb/class/cdc-wdm.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/usb/class/cdc-wdm.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -314,7 +314,7 @@ static ssize_t wdm_write if (r < 0) goto outnp; @@ -30803,30 +30054,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/class/cdc= -wdm.c linux-2.6.32.38/drivers/u r =3D wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE, &desc->flags)); else -diff -urNp linux-2.6.32.38/drivers/usb/class/usblp.c linux-2.6.32.38/dri= vers/usb/class/usblp.c ---- linux-2.6.32.38/drivers/usb/class/usblp.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/usb/class/usblp.c 2011-04-17 15:56:46.000000= 000 -0400 -@@ -228,7 +228,7 @@ static const struct quirk_printer_struct - { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut = */ - { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1= 440 Laser Printer */ - { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Prin= ter M129C */ -- { 0, 0 } -+ { 0, 0, 0 } - }; -=20 - static int usblp_wwait(struct usblp *usblp, int nonblock); -@@ -1412,7 +1412,7 @@ static struct usb_device_id usblp_ids [] - { USB_INTERFACE_INFO(7, 1, 2) }, - { USB_INTERFACE_INFO(7, 1, 3) }, - { USB_DEVICE(0x04b8, 0x0202) }, /* Seiko Epson Receipt Printer M129C *= / -- { } /* Terminating entry */ -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ - }; -=20 - MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.32.38/drivers/usb/core/hcd.c linux-2.6.32.38/driver= s/usb/core/hcd.c ---- linux-2.6.32.38/drivers/usb/core/hcd.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/usb/core/hcd.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/usb/core/hcd.c linux-2.6.32.39/driver= s/usb/core/hcd.c +--- linux-2.6.32.39/drivers/usb/core/hcd.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/usb/core/hcd.c 2011-04-17 15:56:46.000000000= -0400 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd =20 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -30845,9 +30075,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/core/hcd.c= linux-2.6.32.38/drivers/usb/co { =20 if (mon_ops) -diff -urNp linux-2.6.32.38/drivers/usb/core/hcd.h linux-2.6.32.38/driver= s/usb/core/hcd.h ---- linux-2.6.32.38/drivers/usb/core/hcd.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/usb/core/hcd.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/usb/core/hcd.h linux-2.6.32.39/driver= s/usb/core/hcd.h +--- linux-2.6.32.39/drivers/usb/core/hcd.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/usb/core/hcd.h 2011-04-17 15:56:46.000000000= -0400 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) =20 @@ -30875,21 +30105,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/core/hcd.= h linux-2.6.32.38/drivers/usb/co void usb_mon_deregister(void); =20 #else -diff -urNp linux-2.6.32.38/drivers/usb/core/hub.c linux-2.6.32.38/driver= s/usb/core/hub.c ---- linux-2.6.32.38/drivers/usb/core/hub.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/usb/core/hub.c 2011-04-17 15:56:46.000000000= -0400 -@@ -3430,7 +3430,7 @@ static struct usb_device_id hub_id_table - .bDeviceClass =3D USB_CLASS_HUB}, - { .match_flags =3D USB_DEVICE_ID_MATCH_INT_CLASS, - .bInterfaceClass =3D USB_CLASS_HUB}, -- { } /* Terminating entry */ -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ - }; -=20 - MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.32.38/drivers/usb/core/message.c linux-2.6.32.38/dr= ivers/usb/core/message.c ---- linux-2.6.32.38/drivers/usb/core/message.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/usb/core/message.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/usb/core/message.c linux-2.6.32.39/dr= ivers/usb/core/message.c +--- linux-2.6.32.39/drivers/usb/core/message.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/usb/core/message.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf =3D kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -30901,33 +30119,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/core/mess= age.c linux-2.6.32.38/drivers/us if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.32.38/drivers/usb/host/ehci-pci.c linux-2.6.32.38/d= rivers/usb/host/ehci-pci.c ---- linux-2.6.32.38/drivers/usb/host/ehci-pci.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/usb/host/ehci-pci.c 2011-04-17 15:56:46.0000= 00000 -0400 -@@ -461,7 +461,7 @@ static const struct pci_device_id pci_id - PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), - .driver_data =3D (unsigned long) &ehci_pci_hc_driver, - }, -- { /* end: all zeroes */ } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; - MODULE_DEVICE_TABLE(pci, pci_ids); -=20 -diff -urNp linux-2.6.32.38/drivers/usb/host/uhci-hcd.c linux-2.6.32.38/d= rivers/usb/host/uhci-hcd.c ---- linux-2.6.32.38/drivers/usb/host/uhci-hcd.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/usb/host/uhci-hcd.c 2011-04-17 15:56:46.0000= 00000 -0400 -@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p - /* handle any USB UHCI controller */ - PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), - .driver_data =3D (unsigned long) &uhci_driver, -- }, { /* end: all zeroes */ } -+ }, { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.32.38/drivers/usb/misc/appledisplay.c linux-2.6.32.= 38/drivers/usb/misc/appledisplay.c ---- linux-2.6.32.38/drivers/usb/misc/appledisplay.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/usb/misc/appledisplay.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/usb/misc/appledisplay.c linux-2.6.32.= 39/drivers/usb/misc/appledisplay.c +--- linux-2.6.32.39/drivers/usb/misc/appledisplay.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/usb/misc/appledisplay.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -30937,9 +30131,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/misc/apple= display.c linux-2.6.32.38/drive .get_brightness =3D appledisplay_bl_get_brightness, .update_status =3D appledisplay_bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/usb/mon/mon_main.c linux-2.6.32.38/dr= ivers/usb/mon/mon_main.c ---- linux-2.6.32.38/drivers/usb/mon/mon_main.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/usb/mon/mon_main.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/usb/mon/mon_main.c linux-2.6.32.39/dr= ivers/usb/mon/mon_main.c +--- linux-2.6.32.39/drivers/usb/mon/mon_main.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/usb/mon/mon_main.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb =3D { /* * Ops @@ -30949,49 +30143,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/mon/mon_m= ain.c linux-2.6.32.38/drivers/us .urb_submit =3D mon_submit, .urb_submit_error =3D mon_submit_error, .urb_complete =3D mon_complete, -diff -urNp linux-2.6.32.38/drivers/usb/storage/debug.h linux-2.6.32.38/d= rivers/usb/storage/debug.h ---- linux-2.6.32.38/drivers/usb/storage/debug.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/usb/storage/debug.h 2011-04-17 15:56:46.0000= 00000 -0400 -@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char=20 - #define US_DEBUGPX(x...) printk( x ) - #define US_DEBUG(x) x=20 - #else --#define US_DEBUGP(x...) --#define US_DEBUGPX(x...) --#define US_DEBUG(x) -+#define US_DEBUGP(x...) do {} while (0) -+#define US_DEBUGPX(x...) do {} while (0) -+#define US_DEBUG(x) do {} while (0) - #endif -=20 - #endif -diff -urNp linux-2.6.32.38/drivers/usb/storage/usb.c linux-2.6.32.38/dri= vers/usb/storage/usb.c ---- linux-2.6.32.38/drivers/usb/storage/usb.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/drivers/usb/storage/usb.c 2011-04-17 15:56:46.000000= 000 -0400 -@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l -=20 - static struct us_unusual_dev us_unusual_dev_list[] =3D { - # include "unusual_devs.h"=20 -- { } /* Terminating entry */ -+ { NULL, NULL, 0, 0, NULL } /* Terminating entry */ - }; -=20 - #undef UNUSUAL_DEV -diff -urNp linux-2.6.32.38/drivers/usb/storage/usual-tables.c linux-2.6.= 32.38/drivers/usb/storage/usual-tables.c ---- linux-2.6.32.38/drivers/usb/storage/usual-tables.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/usb/storage/usual-tables.c 2011-04-17 15:56:= 46.000000000 -0400 -@@ -48,7 +48,7 @@ -=20 - struct usb_device_id usb_storage_usb_ids[] =3D { - # include "unusual_devs.h" -- { } /* Terminating entry */ -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ - }; - EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -=20 -diff -urNp linux-2.6.32.38/drivers/uwb/wlp/messages.c linux-2.6.32.38/dr= ivers/uwb/wlp/messages.c ---- linux-2.6.32.38/drivers/uwb/wlp/messages.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/uwb/wlp/messages.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/uwb/wlp/messages.c linux-2.6.32.39/dr= ivers/uwb/wlp/messages.c +--- linux-2.6.32.39/drivers/uwb/wlp/messages.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/uwb/wlp/messages.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len =3D skb->len; size_t used; @@ -31001,9 +30155,9 @@ diff -urNp linux-2.6.32.38/drivers/uwb/wlp/messag= es.c linux-2.6.32.38/drivers/uw enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.32.38/drivers/uwb/wlp/sysfs.c linux-2.6.32.38/drive= rs/uwb/wlp/sysfs.c ---- linux-2.6.32.38/drivers/uwb/wlp/sysfs.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/uwb/wlp/sysfs.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/uwb/wlp/sysfs.c linux-2.6.32.39/drive= rs/uwb/wlp/sysfs.c +--- linux-2.6.32.39/drivers/uwb/wlp/sysfs.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/uwb/wlp/sysfs.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -31014,9 +30168,9 @@ diff -urNp linux-2.6.32.38/drivers/uwb/wlp/sysfs.= c linux-2.6.32.38/drivers/uwb/w .show =3D wlp_wss_attr_show, .store =3D wlp_wss_attr_store, }; -diff -urNp linux-2.6.32.38/drivers/video/atmel_lcdfb.c linux-2.6.32.38/d= rivers/video/atmel_lcdfb.c ---- linux-2.6.32.38/drivers/video/atmel_lcdfb.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/drivers/video/atmel_lcdfb.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/atmel_lcdfb.c linux-2.6.32.39/d= rivers/video/atmel_lcdfb.c +--- linux-2.6.32.39/drivers/video/atmel_lcdfb.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/drivers/video/atmel_lcdfb.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -31026,9 +30180,9 @@ diff -urNp linux-2.6.32.38/drivers/video/atmel_lc= dfb.c linux-2.6.32.38/drivers/v .update_status =3D atmel_bl_update_status, .get_brightness =3D atmel_bl_get_brightness, }; -diff -urNp linux-2.6.32.38/drivers/video/aty/aty128fb.c linux-2.6.32.38/= drivers/video/aty/aty128fb.c ---- linux-2.6.32.38/drivers/video/aty/aty128fb.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/video/aty/aty128fb.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/aty/aty128fb.c linux-2.6.32.39/= drivers/video/aty/aty128fb.c +--- linux-2.6.32.39/drivers/video/aty/aty128fb.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/video/aty/aty128fb.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -31038,9 +30192,9 @@ diff -urNp linux-2.6.32.38/drivers/video/aty/aty1= 28fb.c linux-2.6.32.38/drivers/ .get_brightness =3D aty128_bl_get_brightness, .update_status =3D aty128_bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/video/aty/atyfb_base.c linux-2.6.32.3= 8/drivers/video/aty/atyfb_base.c ---- linux-2.6.32.38/drivers/video/aty/atyfb_base.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/video/aty/atyfb_base.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/aty/atyfb_base.c linux-2.6.32.3= 9/drivers/video/aty/atyfb_base.c +--- linux-2.6.32.39/drivers/video/aty/atyfb_base.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/drivers/video/aty/atyfb_base.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct=20 return bd->props.brightness; } @@ -31050,9 +30204,9 @@ diff -urNp linux-2.6.32.38/drivers/video/aty/atyf= b_base.c linux-2.6.32.38/driver .get_brightness =3D aty_bl_get_brightness, .update_status =3D aty_bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/video/aty/radeon_backlight.c linux-2.= 6.32.38/drivers/video/aty/radeon_backlight.c ---- linux-2.6.32.38/drivers/video/aty/radeon_backlight.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/aty/radeon_backlight.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/aty/radeon_backlight.c linux-2.= 6.32.39/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32.39/drivers/video/aty/radeon_backlight.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/aty/radeon_backlight.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -31062,9 +30216,9 @@ diff -urNp linux-2.6.32.38/drivers/video/aty/rade= on_backlight.c linux-2.6.32.38/ .get_brightness =3D radeon_bl_get_brightness, .update_status =3D radeon_bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/adp5520_bl.c linux-2.= 6.32.38/drivers/video/backlight/adp5520_bl.c ---- linux-2.6.32.38/drivers/video/backlight/adp5520_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/adp5520_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c linux-2.= 6.32.39/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str return error ? data->current_brightness : reg_val; } @@ -31074,9 +30228,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/adp5520_bl.c linux-2.6.32.38/ .update_status =3D adp5520_bl_update_status, .get_brightness =3D adp5520_bl_get_brightness, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/adx_bl.c linux-2.6.32= .38/drivers/video/backlight/adx_bl.c ---- linux-2.6.32.38/drivers/video/backlight/adx_bl.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/adx_bl.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/adx_bl.c linux-2.6.32= .39/drivers/video/backlight/adx_bl.c +--- linux-2.6.32.39/drivers/video/backlight/adx_bl.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/adx_bl.c 2011-04-17 15:56:46= .000000000 -0400 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct return 1; } @@ -31086,9 +30240,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/adx_bl.c linux-2.6.32.38/driv .options =3D 0, .update_status =3D adx_backlight_update_status, .get_brightness =3D adx_backlight_get_brightness, -diff -urNp linux-2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c linux-= 2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c ---- linux-2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c 2011-04-17 15= :56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c linux-= 2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c +--- linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c 2011-04-17 15= :56:46.000000000 -0400 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct=20 return pwm_channel_enable(&pwmbl->pwmc); } @@ -31098,9 +30252,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/atmel-pwm-bl.c linux-2.6.32.3 .get_brightness =3D atmel_pwm_bl_get_intensity, .update_status =3D atmel_pwm_bl_set_intensity, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/backlight.c linux-2.6= .32.38/drivers/video/backlight/backlight.c ---- linux-2.6.32.38/drivers/video/backlight/backlight.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/backlight.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/backlight.c linux-2.6= .32.39/drivers/video/backlight/backlight.c +--- linux-2.6.32.39/drivers/video/backlight/backlight.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/backlight.c 2011-04-17 15:56= :46.000000000 -0400 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ @@ -31110,9 +30264,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/backlight.c linux-2.6.32.38/d { struct backlight_device *new_bd; int rc; -diff -urNp linux-2.6.32.38/drivers/video/backlight/corgi_lcd.c linux-2.6= .32.38/drivers/video/backlight/corgi_lcd.c ---- linux-2.6.32.38/drivers/video/backlight/corgi_lcd.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/corgi_lcd.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c linux-2.6= .32.39/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c 2011-04-17 15:56= :46.000000000 -0400 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } EXPORT_SYMBOL(corgi_lcd_limit_intensity); @@ -31122,9 +30276,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/corgi_lcd.c linux-2.6.32.38/d .get_brightness =3D corgi_bl_get_intensity, .update_status =3D corgi_bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/cr_bllcd.c linux-2.6.= 32.38/drivers/video/backlight/cr_bllcd.c ---- linux-2.6.32.38/drivers/video/backlight/cr_bllcd.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/cr_bllcd.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c linux-2.6.= 32.39/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -31134,9 +30288,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/cr_bllcd.c linux-2.6.32.38/dr .get_brightness =3D cr_backlight_get_intensity, .update_status =3D cr_backlight_set_intensity, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/da903x_bl.c linux-2.6= .32.38/drivers/video/backlight/da903x_bl.c ---- linux-2.6.32.38/drivers/video/backlight/da903x_bl.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/da903x_bl.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/da903x_bl.c linux-2.6= .32.39/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32.39/drivers/video/backlight/da903x_bl.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/da903x_bl.c 2011-04-17 15:56= :46.000000000 -0400 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -31146,9 +30300,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/da903x_bl.c linux-2.6.32.38/d .update_status =3D da903x_backlight_update_status, .get_brightness =3D da903x_backlight_get_brightness, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/generic_bl.c linux-2.= 6.32.38/drivers/video/backlight/generic_bl.c ---- linux-2.6.32.38/drivers/video/backlight/generic_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/generic_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/generic_bl.c linux-2.= 6.32.39/drivers/video/backlight/generic_bl.c +--- linux-2.6.32.39/drivers/video/backlight/generic_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/generic_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } EXPORT_SYMBOL(corgibl_limit_intensity); @@ -31158,9 +30312,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/generic_bl.c linux-2.6.32.38/ .options =3D BL_CORE_SUSPENDRESUME, .get_brightness =3D genericbl_get_intensity, .update_status =3D genericbl_send_intensity, -diff -urNp linux-2.6.32.38/drivers/video/backlight/hp680_bl.c linux-2.6.= 32.38/drivers/video/backlight/hp680_bl.c ---- linux-2.6.32.38/drivers/video/backlight/hp680_bl.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/hp680_bl.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/hp680_bl.c linux-2.6.= 32.39/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32.39/drivers/video/backlight/hp680_bl.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/hp680_bl.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct=20 return current_intensity; } @@ -31170,9 +30324,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/hp680_bl.c linux-2.6.32.38/dr .get_brightness =3D hp680bl_get_intensity, .update_status =3D hp680bl_set_intensity, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/jornada720_bl.c linux= -2.6.32.38/drivers/video/backlight/jornada720_bl.c ---- linux-2.6.32.38/drivers/video/backlight/jornada720_bl.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/jornada720_bl.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c linux= -2.6.32.39/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -93,7 +93,7 @@ out: return ret; } @@ -31182,9 +30336,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/jornada720_bl.c linux-2.6.32. .get_brightness =3D jornada_bl_get_brightness, .update_status =3D jornada_bl_update_status, .options =3D BL_CORE_SUSPENDRESUME, -diff -urNp linux-2.6.32.38/drivers/video/backlight/kb3886_bl.c linux-2.6= .32.38/drivers/video/backlight/kb3886_bl.c ---- linux-2.6.32.38/drivers/video/backlight/kb3886_bl.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/kb3886_bl.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c linux-2.6= .32.39/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c 2011-04-17 15:56= :46.000000000 -0400 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -31194,9 +30348,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/kb3886_bl.c linux-2.6.32.38/d .get_brightness =3D kb3886bl_get_intensity, .update_status =3D kb3886bl_send_intensity, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/locomolcd.c linux-2.6= .32.38/drivers/video/backlight/locomolcd.c ---- linux-2.6.32.38/drivers/video/backlight/locomolcd.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/locomolcd.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/locomolcd.c linux-2.6= .32.39/drivers/video/backlight/locomolcd.c +--- linux-2.6.32.39/drivers/video/backlight/locomolcd.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/locomolcd.c 2011-04-17 15:56= :46.000000000 -0400 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -31206,9 +30360,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/locomolcd.c linux-2.6.32.38/d .get_brightness =3D locomolcd_get_intensity, .update_status =3D locomolcd_set_intensity, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c linux= -2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c ---- linux-2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c linux= -2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c +--- linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c 2011-04-17 1= 5:56:46.000000000 -0400 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; unsigned long iolen; @@ -31218,9 +30372,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/mbp_nvidia_bl.c linux-2.6.32. }; =20 /* Module parameters. */ -diff -urNp linux-2.6.32.38/drivers/video/backlight/omap1_bl.c linux-2.6.= 32.38/drivers/video/backlight/omap1_bl.c ---- linux-2.6.32.38/drivers/video/backlight/omap1_bl.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/omap1_bl.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/omap1_bl.c linux-2.6.= 32.39/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32.39/drivers/video/backlight/omap1_bl.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/omap1_bl.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -31230,9 +30384,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/omap1_bl.c linux-2.6.32.38/dr .get_brightness =3D omapbl_get_intensity, .update_status =3D omapbl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/progear_bl.c linux-2.= 6.32.38/drivers/video/backlight/progear_bl.c ---- linux-2.6.32.38/drivers/video/backlight/progear_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/progear_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/progear_bl.c linux-2.= 6.32.39/drivers/video/backlight/progear_bl.c +--- linux-2.6.32.39/drivers/video/backlight/progear_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/progear_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -31242,9 +30396,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/progear_bl.c linux-2.6.32.38/ .get_brightness =3D progearbl_get_intensity, .update_status =3D progearbl_set_intensity, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/pwm_bl.c linux-2.6.32= .38/drivers/video/backlight/pwm_bl.c ---- linux-2.6.32.38/drivers/video/backlight/pwm_bl.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/pwm_bl.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/pwm_bl.c linux-2.6.32= .39/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32.39/drivers/video/backlight/pwm_bl.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/pwm_bl.c 2011-04-17 15:56:46= .000000000 -0400 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -31254,9 +30408,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/pwm_bl.c linux-2.6.32.38/driv .update_status =3D pwm_backlight_update_status, .get_brightness =3D pwm_backlight_get_brightness, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/tosa_bl.c linux-2.6.3= 2.38/drivers/video/backlight/tosa_bl.c ---- linux-2.6.32.38/drivers/video/backlight/tosa_bl.c 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/tosa_bl.c 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/tosa_bl.c linux-2.6.3= 2.39/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32.39/drivers/video/backlight/tosa_bl.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/tosa_bl.c 2011-04-17 15:56:4= 6.000000000 -0400 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -31266,9 +30420,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/tosa_bl.c linux-2.6.32.38/dri .get_brightness =3D tosa_bl_get_brightness, .update_status =3D tosa_bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/video/backlight/wm831x_bl.c linux-2.6= .32.38/drivers/video/backlight/wm831x_bl.c ---- linux-2.6.32.38/drivers/video/backlight/wm831x_bl.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/backlight/wm831x_bl.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c linux-2.6= .32.39/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c 2011-04-17 15:56= :46.000000000 -0400 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne return data->current_brightness; } @@ -31278,9 +30432,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backligh= t/wm831x_bl.c linux-2.6.32.38/d .options =3D BL_CORE_SUSPENDRESUME, .update_status =3D wm831x_backlight_update_status, .get_brightness =3D wm831x_backlight_get_brightness, -diff -urNp linux-2.6.32.38/drivers/video/bf54x-lq043fb.c linux-2.6.32.38= /drivers/video/bf54x-lq043fb.c ---- linux-2.6.32.38/drivers/video/bf54x-lq043fb.c 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/drivers/video/bf54x-lq043fb.c 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/bf54x-lq043fb.c linux-2.6.32.39= /drivers/video/bf54x-lq043fb.c +--- linux-2.6.32.39/drivers/video/bf54x-lq043fb.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/drivers/video/bf54x-lq043fb.c 2011-04-17 15:56:46.00= 0000000 -0400 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -31290,9 +30444,9 @@ diff -urNp linux-2.6.32.38/drivers/video/bf54x-lq= 043fb.c linux-2.6.32.38/drivers .get_brightness =3D bl_get_brightness, }; =20 -diff -urNp linux-2.6.32.38/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32= .38/drivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.32.38/drivers/video/bfin-t350mcqb-fb.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/drivers/video/bfin-t350mcqb-fb.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32= .39/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c 2011-04-17 15:56:46= .000000000 -0400 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -31302,9 +30456,9 @@ diff -urNp linux-2.6.32.38/drivers/video/bfin-t35= 0mcqb-fb.c linux-2.6.32.38/driv .get_brightness =3D bl_get_brightness, }; =20 -diff -urNp linux-2.6.32.38/drivers/video/fbcmap.c linux-2.6.32.38/driver= s/video/fbcmap.c ---- linux-2.6.32.38/drivers/video/fbcmap.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/video/fbcmap.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/video/fbcmap.c linux-2.6.32.39/driver= s/video/fbcmap.c +--- linux-2.6.32.39/drivers/video/fbcmap.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/video/fbcmap.c 2011-04-17 15:56:46.000000000= -0400 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc =3D -ENODEV; goto out; @@ -31315,9 +30469,9 @@ diff -urNp linux-2.6.32.38/drivers/video/fbcmap.c= linux-2.6.32.38/drivers/video/ rc =3D -EINVAL; goto out1; } -diff -urNp linux-2.6.32.38/drivers/video/fbmem.c linux-2.6.32.38/drivers= /video/fbmem.c ---- linux-2.6.32.38/drivers/video/fbmem.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/video/fbmem.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/drivers/video/fbmem.c linux-2.6.32.39/drivers= /video/fbmem.c +--- linux-2.6.32.39/drivers/video/fbmem.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/drivers/video/fbmem.c 2011-04-17 15:56:46.000000000 = -0400 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx +=3D image->width + 8; } @@ -31345,21 +30499,9 @@ diff -urNp linux-2.6.32.38/drivers/video/fbmem.c= linux-2.6.32.38/drivers/video/f return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.32.38/drivers/video/fbmon.c linux-2.6.32.38/drivers= /video/fbmon.c ---- linux-2.6.32.38/drivers/video/fbmon.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/drivers/video/fbmon.c 2011-04-17 15:56:46.000000000 = -0400 -@@ -45,7 +45,7 @@ - #ifdef DEBUG - #define DPRINTK(fmt, args...) printk(fmt,## args) - #else --#define DPRINTK(fmt, args...) -+#define DPRINTK(fmt, args...) do {} while (0) - #endif -=20 - #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.32.38/drivers/video/i810/i810_accel.c linux-2.6.32.= 38/drivers/video/i810/i810_accel.c ---- linux-2.6.32.38/drivers/video/i810/i810_accel.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/drivers/video/i810/i810_accel.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/i810/i810_accel.c linux-2.6.32.= 39/drivers/video/i810/i810_accel.c +--- linux-2.6.32.39/drivers/video/i810/i810_accel.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/drivers/video/i810/i810_accel.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct=20 } } @@ -31368,324 +30510,9 @@ diff -urNp linux-2.6.32.38/drivers/video/i810/i= 810_accel.c linux-2.6.32.38/drive i810_report_error(mmio);=20 par->dev_flags |=3D LOCKUP; info->pixmap.scan_align =3D 1; -diff -urNp linux-2.6.32.38/drivers/video/i810/i810_main.c linux-2.6.32.3= 8/drivers/video/i810/i810_main.c ---- linux-2.6.32.38/drivers/video/i810/i810_main.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/drivers/video/i810/i810_main.c 2011-04-17 15:56:46.0= 00000000 -0400 -@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, - { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 }, -- { 0 }, -+ { 0, 0, 0, 0, 0, 0, 0 }, - }; -=20 - static struct pci_driver i810fb_driver =3D { -diff -urNp linux-2.6.32.38/drivers/video/modedb.c linux-2.6.32.38/driver= s/video/modedb.c ---- linux-2.6.32.38/drivers/video/modedb.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/video/modedb.c 2011-04-17 15:56:46.000000000= -0400 -@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ - { - /* 640x400 @ 70 Hz, 31.5 kHz hsync */ - NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 640x480 @ 60 Hz, 31.5 kHz hsync */ - NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 800x600 @ 56 Hz, 35.15 kHz hsync */ - NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync */ - NULL, 87, 1024, 768, 22271, 56, 24, 33, 8, 160, 8, -- 0, FB_VMODE_INTERLACED -+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 640x400 @ 85 Hz, 37.86 kHz hsync */ - NULL, 85, 640, 400, 31746, 96, 32, 41, 1, 64, 3, -- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 640x480 @ 72 Hz, 36.5 kHz hsync */ - NULL, 72, 640, 480, 31746, 144, 40, 30, 8, 40, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 640x480 @ 75 Hz, 37.50 kHz hsync */ - NULL, 75, 640, 480, 31746, 120, 16, 16, 1, 64, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 800x600 @ 60 Hz, 37.8 kHz hsync */ - NULL, 60, 800, 600, 25000, 88, 40, 23, 1, 128, 4, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 640x480 @ 85 Hz, 43.27 kHz hsync */ - NULL, 85, 640, 480, 27777, 80, 56, 25, 1, 56, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1152x864 @ 89 Hz interlaced, 44 kHz hsync */ - NULL, 89, 1152, 864, 15384, 96, 16, 110, 1, 216, 10, -- 0, FB_VMODE_INTERLACED -+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 800x600 @ 72 Hz, 48.0 kHz hsync */ - NULL, 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1024x768 @ 60 Hz, 48.4 kHz hsync */ - NULL, 60, 1024, 768, 15384, 168, 8, 29, 3, 144, 6, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 640x480 @ 100 Hz, 53.01 kHz hsync */ - NULL, 100, 640, 480, 21834, 96, 32, 36, 8, 96, 6, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1152x864 @ 60 Hz, 53.5 kHz hsync */ - NULL, 60, 1152, 864, 11123, 208, 64, 16, 4, 256, 8, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 800x600 @ 85 Hz, 55.84 kHz hsync */ - NULL, 85, 800, 600, 16460, 160, 64, 36, 16, 64, 5, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1024x768 @ 70 Hz, 56.5 kHz hsync */ - NULL, 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */ - NULL, 87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12, -- 0, FB_VMODE_INTERLACED -+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 800x600 @ 100 Hz, 64.02 kHz hsync */ - NULL, 100, 800, 600, 14357, 160, 64, 30, 4, 64, 6, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1024x768 @ 76 Hz, 62.5 kHz hsync */ - NULL, 76, 1024, 768, 11764, 208, 8, 36, 16, 120, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1152x864 @ 70 Hz, 62.4 kHz hsync */ - NULL, 70, 1152, 864, 10869, 106, 56, 20, 1, 160, 10, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1280x1024 @ 61 Hz, 64.2 kHz hsync */ - NULL, 61, 1280, 1024, 9090, 200, 48, 26, 1, 184, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1400x1050 @ 60Hz, 63.9 kHz hsync */ - NULL, 60, 1400, 1050, 9259, 136, 40, 13, 1, 112, 3, -- 0, FB_VMODE_NONINTERLACED =09 -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1400x1050 @ 75,107 Hz, 82,392 kHz +hsync +vsync*/ - NULL, 75, 1400, 1050, 7190, 120, 56, 23, 10, 112, 13, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1400x1050 @ 60 Hz, ? kHz +hsync +vsync*/ - NULL, 60, 1400, 1050, 9259, 128, 40, 12, 0, 112, 3, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1024x768 @ 85 Hz, 70.24 kHz hsync */ - NULL, 85, 1024, 768, 10111, 192, 32, 34, 14, 160, 6, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1152x864 @ 78 Hz, 70.8 kHz hsync */ - NULL, 78, 1152, 864, 9090, 228, 88, 32, 0, 84, 12, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1280x1024 @ 70 Hz, 74.59 kHz hsync */ - NULL, 70, 1280, 1024, 7905, 224, 32, 28, 8, 160, 8, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1600x1200 @ 60Hz, 75.00 kHz hsync */ - NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1152x864 @ 84 Hz, 76.0 kHz hsync */ - NULL, 84, 1152, 864, 7407, 184, 312, 32, 0, 128, 12, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1280x1024 @ 74 Hz, 78.85 kHz hsync */ - NULL, 74, 1280, 1024, 7407, 256, 32, 34, 3, 144, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1024x768 @ 100Hz, 80.21 kHz hsync */ - NULL, 100, 1024, 768, 8658, 192, 32, 21, 3, 192, 10, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1280x1024 @ 76 Hz, 81.13 kHz hsync */ - NULL, 76, 1280, 1024, 7407, 248, 32, 34, 3, 104, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1600x1200 @ 70 Hz, 87.50 kHz hsync */ - NULL, 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1152x864 @ 100 Hz, 89.62 kHz hsync */ - NULL, 100, 1152, 864, 7264, 224, 32, 17, 2, 128, 19, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1280x1024 @ 85 Hz, 91.15 kHz hsync */ - NULL, 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1600x1200 @ 75 Hz, 93.75 kHz hsync */ - NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1680x1050 @ 60 Hz, 65.191 kHz hsync */ - NULL, 60, 1680, 1050, 6848, 280, 104, 30, 3, 176, 6, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1600x1200 @ 85 Hz, 105.77 kHz hsync */ - NULL, 85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1280x1024 @ 100 Hz, 107.16 kHz hsync */ - NULL, 100, 1280, 1024, 5502, 256, 32, 26, 7, 128, 15, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1800x1440 @ 64Hz, 96.15 kHz hsync */ - NULL, 64, 1800, 1440, 4347, 304, 96, 46, 1, 192, 3, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1800x1440 @ 70Hz, 104.52 kHz hsync */ - NULL, 70, 1800, 1440, 4000, 304, 96, 46, 1, 192, 3, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 512x384 @ 78 Hz, 31.50 kHz hsync */ - NULL, 78, 512, 384, 49603, 48, 16, 16, 1, 64, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 512x384 @ 85 Hz, 34.38 kHz hsync */ - NULL, 85, 512, 384, 45454, 48, 16, 16, 1, 64, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio */ - NULL, 70, 320, 200, 79440, 16, 16, 20, 4, 48, 1, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio */ - NULL, 60, 320, 240, 79440, 16, 16, 16, 5, 48, 1, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 320x240 @ 72 Hz, 36.5 kHz hsync */ - NULL, 72, 320, 240, 63492, 16, 16, 16, 4, 48, 2, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio */ - NULL, 56, 400, 300, 55555, 64, 16, 10, 1, 32, 1, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 400x300 @ 60 Hz, 37.8 kHz hsync */ - NULL, 60, 400, 300, 50000, 48, 16, 11, 1, 64, 2, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 400x300 @ 72 Hz, 48.0 kHz hsync */ - NULL, 72, 400, 300, 40000, 32, 24, 11, 19, 64, 3, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio */ - NULL, 56, 480, 300, 46176, 80, 16, 10, 1, 40, 1, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 480x300 @ 60 Hz, 37.8 kHz hsync */ - NULL, 60, 480, 300, 41858, 56, 16, 11, 1, 80, 2, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 480x300 @ 63 Hz, 39.6 kHz hsync */ - NULL, 63, 480, 300, 40000, 56, 16, 11, 1, 80, 2, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 480x300 @ 72 Hz, 48.0 kHz hsync */ - NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, -- 0, FB_VMODE_DOUBLE -+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN - }, { - /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */ - NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */ - NULL, 60, 1152, 768, 14047, 158, 26, 29, 3, 136, 6, -- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED -+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB= _MODE_IS_UNKNOWN - }, { - /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */ - NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 1280x800, 60 Hz, 47.403 kHz hsync, WXGA 16:10 aspect ratio */ - NULL, 60, 1280, 800, 12048, 200, 64, 24, 1, 136, 3, -- 0, FB_VMODE_NONINTERLACED -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 720x576i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ - NULL, 50, 720, 576, 74074, 64, 16, 39, 5, 64, 5, -- 0, FB_VMODE_INTERLACED -+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN - }, { - /* 800x520i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ - NULL, 50, 800, 520, 58823, 144, 64, 72, 28, 80, 5, -- 0, FB_VMODE_INTERLACED -+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN - }, - }; -=20 -diff -urNp linux-2.6.32.38/drivers/video/nvidia/nv_backlight.c linux-2.6= .32.38/drivers/video/nvidia/nv_backlight.c ---- linux-2.6.32.38/drivers/video/nvidia/nv_backlight.c 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/drivers/video/nvidia/nv_backlight.c 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c linux-2.6= .32.39/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c 2011-04-17 15:56= :46.000000000 -0400 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -31695,9 +30522,9 @@ diff -urNp linux-2.6.32.38/drivers/video/nvidia/n= v_backlight.c linux-2.6.32.38/d .get_brightness =3D nvidia_bl_get_brightness, .update_status =3D nvidia_bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/video/riva/fbdev.c linux-2.6.32.38/dr= ivers/video/riva/fbdev.c ---- linux-2.6.32.38/drivers/video/riva/fbdev.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/drivers/video/riva/fbdev.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/drivers/video/riva/fbdev.c linux-2.6.32.39/dr= ivers/video/riva/fbdev.c +--- linux-2.6.32.39/drivers/video/riva/fbdev.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/drivers/video/riva/fbdev.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -31707,9 +30534,9 @@ diff -urNp linux-2.6.32.38/drivers/video/riva/fbd= ev.c linux-2.6.32.38/drivers/vi .get_brightness =3D riva_bl_get_brightness, .update_status =3D riva_bl_update_status, }; -diff -urNp linux-2.6.32.38/drivers/video/uvesafb.c linux-2.6.32.38/drive= rs/video/uvesafb.c ---- linux-2.6.32.38/drivers/video/uvesafb.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/drivers/video/uvesafb.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/drivers/video/uvesafb.c linux-2.6.32.39/drive= rs/video/uvesafb.c +--- linux-2.6.32.39/drivers/video/uvesafb.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/drivers/video/uvesafb.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -18,6 +18,7 @@ #include #include @@ -31785,9 +30612,9 @@ diff -urNp linux-2.6.32.38/drivers/video/uvesafb.= c linux-2.6.32.38/drivers/video } =20 framebuffer_release(info); -diff -urNp linux-2.6.32.38/drivers/video/vesafb.c linux-2.6.32.38/driver= s/video/vesafb.c ---- linux-2.6.32.38/drivers/video/vesafb.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/drivers/video/vesafb.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/drivers/video/vesafb.c linux-2.6.32.39/driver= s/video/vesafb.c +--- linux-2.6.32.39/drivers/video/vesafb.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/drivers/video/vesafb.c 2011-04-17 15:56:46.000000000= -0400 @@ -9,6 +9,7 @@ */ =20 @@ -31891,9 +30718,9 @@ diff -urNp linux-2.6.32.38/drivers/video/vesafb.c= linux-2.6.32.38/drivers/video/ if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.32.38/drivers/xen/sys-hypervisor.c linux-2.6.32.38/= drivers/xen/sys-hypervisor.c ---- linux-2.6.32.38/drivers/xen/sys-hypervisor.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/drivers/xen/sys-hypervisor.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/drivers/xen/sys-hypervisor.c linux-2.6.32.39/= drivers/xen/sys-hypervisor.c +--- linux-2.6.32.39/drivers/xen/sys-hypervisor.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/drivers/xen/sys-hypervisor.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -31903,9 +30730,9 @@ diff -urNp linux-2.6.32.38/drivers/xen/sys-hyperv= isor.c linux-2.6.32.38/drivers/ .show =3D hyp_sysfs_show, .store =3D hyp_sysfs_store, }; -diff -urNp linux-2.6.32.38/fs/9p/vfs_inode.c linux-2.6.32.38/fs/9p/vfs_i= node.c ---- linux-2.6.32.38/fs/9p/vfs_inode.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/9p/vfs_inode.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/fs/9p/vfs_inode.c linux-2.6.32.39/fs/9p/vfs_i= node.c +--- linux-2.6.32.39/fs/9p/vfs_inode.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/fs/9p/vfs_inode.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -31915,9 +30742,9 @@ diff -urNp linux-2.6.32.38/fs/9p/vfs_inode.c linu= x-2.6.32.38/fs/9p/vfs_inode.c =20 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "" : s); -diff -urNp linux-2.6.32.38/fs/aio.c linux-2.6.32.38/fs/aio.c ---- linux-2.6.32.38/fs/aio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/aio.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/aio.c linux-2.6.32.39/fs/aio.c +--- linux-2.6.32.39/fs/aio.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/aio.c 2011-04-17 15:56:46.000000000 -0400 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx=20 size +=3D sizeof(struct io_event) * nr_events; nr_pages =3D (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -31927,9 +30754,9 @@ diff -urNp linux-2.6.32.38/fs/aio.c linux-2.6.32.= 38/fs/aio.c return -EINVAL; =20 nr_events =3D (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeo= f(struct io_event); -diff -urNp linux-2.6.32.38/fs/attr.c linux-2.6.32.38/fs/attr.c ---- linux-2.6.32.38/fs/attr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/attr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/attr.c linux-2.6.32.39/fs/attr.c +--- linux-2.6.32.39/fs/attr.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/attr.c 2011-04-17 15:56:46.000000000 -0400 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode=20 unsigned long limit; =20 @@ -31938,9 +30765,9 @@ diff -urNp linux-2.6.32.38/fs/attr.c linux-2.6.32= .38/fs/attr.c if (limit !=3D RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-2.6.32.38/fs/autofs/root.c linux-2.6.32.38/fs/autofs/ro= ot.c ---- linux-2.6.32.38/fs/autofs/root.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/autofs/root.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/autofs/root.c linux-2.6.32.39/fs/autofs/ro= ot.c +--- linux-2.6.32.39/fs/autofs/root.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/autofs/root.c 2011-04-17 15:56:46.000000000 -0400 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl =3D &sbi->symlink[n]; @@ -31951,9 +30778,9 @@ diff -urNp linux-2.6.32.38/fs/autofs/root.c linux= -2.6.32.38/fs/autofs/root.c if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.32.38/fs/autofs4/symlink.c linux-2.6.32.38/fs/autof= s4/symlink.c ---- linux-2.6.32.38/fs/autofs4/symlink.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/fs/autofs4/symlink.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/fs/autofs4/symlink.c linux-2.6.32.39/fs/autof= s4/symlink.c +--- linux-2.6.32.39/fs/autofs4/symlink.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/fs/autofs4/symlink.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidat= a *nd) { @@ -31963,9 +30790,9 @@ diff -urNp linux-2.6.32.38/fs/autofs4/symlink.c l= inux-2.6.32.38/fs/autofs4/symli return NULL; } =20 -diff -urNp linux-2.6.32.38/fs/befs/linuxvfs.c linux-2.6.32.38/fs/befs/li= nuxvfs.c ---- linux-2.6.32.38/fs/befs/linuxvfs.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/befs/linuxvfs.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/fs/befs/linuxvfs.c linux-2.6.32.39/fs/befs/li= nuxvfs.c +--- linux-2.6.32.39/fs/befs/linuxvfs.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/fs/befs/linuxvfs.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry=20 { befs_inode_info *befs_ino =3D BEFS_I(dentry->d_inode); @@ -31975,9 +30802,9 @@ diff -urNp linux-2.6.32.38/fs/befs/linuxvfs.c lin= ux-2.6.32.38/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.32.38/fs/binfmt_aout.c linux-2.6.32.38/fs/binfmt_ao= ut.c ---- linux-2.6.32.38/fs/binfmt_aout.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/binfmt_aout.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/binfmt_aout.c linux-2.6.32.39/fs/binfmt_ao= ut.c +--- linux-2.6.32.39/fs/binfmt_aout.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/binfmt_aout.c 2011-04-17 15:56:46.000000000 -0400 @@ -16,6 +16,7 @@ #include #include @@ -32065,9 +30892,9 @@ diff -urNp linux-2.6.32.38/fs/binfmt_aout.c linux= -2.6.32.38/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.32.38/fs/binfmt_elf.c linux-2.6.32.38/fs/binfmt_elf= .c ---- linux-2.6.32.38/fs/binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/binfmt_elf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/binfmt_elf.c linux-2.6.32.39/fs/binfmt_elf= .c +--- linux-2.6.32.39/fs/binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/binfmt_elf.c 2011-04-17 15:56:46.000000000 -0400 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -32739,9 +31566,9 @@ diff -urNp linux-2.6.32.38/fs/binfmt_elf.c linux-= 2.6.32.38/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.32.38/fs/binfmt_flat.c linux-2.6.32.38/fs/binfmt_fl= at.c ---- linux-2.6.32.38/fs/binfmt_flat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/binfmt_flat.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/binfmt_flat.c linux-2.6.32.39/fs/binfmt_fl= at.c +--- linux-2.6.32.39/fs/binfmt_flat.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/binfmt_flat.c 2011-04-17 15:56:46.000000000 -0400 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b realdatastart =3D (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -32774,21 +31601,9 @@ diff -urNp linux-2.6.32.38/fs/binfmt_flat.c linu= x-2.6.32.38/fs/binfmt_flat.c ret =3D result; goto err; } -diff -urNp linux-2.6.32.38/fs/binfmt_misc.c linux-2.6.32.38/fs/binfmt_mi= sc.c ---- linux-2.6.32.38/fs/binfmt_misc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/binfmt_misc.c 2011-04-17 15:56:46.000000000 -0400 -@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl - static struct tree_descr bm_files[] =3D { - [2] =3D {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, - [3] =3D {"register", &bm_register_operations, S_IWUSR}, -- /* last one */ {""} -+ /* last one */ {"", NULL, 0} - }; - int err =3D simple_fill_super(sb, 0x42494e4d, bm_files); - if (!err) -diff -urNp linux-2.6.32.38/fs/bio.c linux-2.6.32.38/fs/bio.c ---- linux-2.6.32.38/fs/bio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/bio.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/bio.c linux-2.6.32.39/fs/bio.c +--- linux-2.6.32.39/fs/bio.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/bio.c 2011-04-17 15:56:46.000000000 -0400 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr =20 i =3D 0; @@ -32807,9 +31622,9 @@ diff -urNp linux-2.6.32.38/fs/bio.c linux-2.6.32.= 38/fs/bio.c =20 __bio_for_each_segment(bvec, bio, i, 0) { char *addr =3D page_address(bvec->bv_page); -diff -urNp linux-2.6.32.38/fs/block_dev.c linux-2.6.32.38/fs/block_dev.c ---- linux-2.6.32.38/fs/block_dev.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/block_dev.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/block_dev.c linux-2.6.32.39/fs/block_dev.c +--- linux-2.6.32.39/fs/block_dev.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/block_dev.c 2011-04-17 15:56:46.000000000 -0400 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,=20 else if (bdev->bd_contains =3D=3D bdev) res =3D 0; /* is a whole device which isn't held */ @@ -32819,9 +31634,9 @@ diff -urNp linux-2.6.32.38/fs/block_dev.c linux-2= .6.32.38/fs/block_dev.c res =3D 0; /* is a partition of a device that is being partitioned = */ else if (bdev->bd_contains->bd_holder !=3D NULL) res =3D -EBUSY; /* is a partition of a held device */ -diff -urNp linux-2.6.32.38/fs/btrfs/ctree.c linux-2.6.32.38/fs/btrfs/ctr= ee.c ---- linux-2.6.32.38/fs/btrfs/ctree.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/btrfs/ctree.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/btrfs/ctree.c linux-2.6.32.39/fs/btrfs/ctr= ee.c +--- linux-2.6.32.39/fs/btrfs/ctree.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/btrfs/ctree.c 2011-04-17 15:56:46.000000000 -0400 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st free_extent_buffer(buf); add_root_to_dirty_list(root); @@ -32846,9 +31661,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/ctree.c linux= -2.6.32.38/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret =3D fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.32.38/fs/btrfs/disk-io.c linux-2.6.32.38/fs/btrfs/d= isk-io.c ---- linux-2.6.32.38/fs/btrfs/disk-io.c 2011-04-17 17:00:52.000000000 -04= 00 -+++ linux-2.6.32.38/fs/btrfs/disk-io.c 2011-04-17 17:03:11.000000000 -04= 00 +diff -urNp linux-2.6.32.39/fs/btrfs/disk-io.c linux-2.6.32.39/fs/btrfs/d= isk-io.c +--- linux-2.6.32.39/fs/btrfs/disk-io.c 2011-04-17 17:00:52.000000000 -04= 00 ++++ linux-2.6.32.39/fs/btrfs/disk-io.c 2011-04-17 17:03:11.000000000 -04= 00 @@ -39,7 +39,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -32867,9 +31682,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/disk-io.c lin= ux-2.6.32.38/fs/btrfs/disk-io.c .write_cache_pages_lock_hook =3D btree_lock_page_hook, .readpage_end_io_hook =3D btree_readpage_end_io_hook, .submit_bio_hook =3D btree_submit_bio_hook, -diff -urNp linux-2.6.32.38/fs/btrfs/extent_io.h linux-2.6.32.38/fs/btrfs= /extent_io.h ---- linux-2.6.32.38/fs/btrfs/extent_io.h 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/fs/btrfs/extent_io.h 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/fs/btrfs/extent_io.h linux-2.6.32.39/fs/btrfs= /extent_io.h +--- linux-2.6.32.39/fs/btrfs/extent_io.h 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/fs/btrfs/extent_io.h 2011-04-17 15:56:46.000000000 -= 0400 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags); @@ -32930,9 +31745,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/extent_io.h l= inux-2.6.32.38/fs/btrfs/extent_ }; =20 struct extent_state { -diff -urNp linux-2.6.32.38/fs/btrfs/free-space-cache.c linux-2.6.32.38/f= s/btrfs/free-space-cache.c ---- linux-2.6.32.38/fs/btrfs/free-space-cache.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/fs/btrfs/free-space-cache.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/fs/btrfs/free-space-cache.c linux-2.6.32.39/f= s/btrfs/free-space-cache.c +--- linux-2.6.32.39/fs/btrfs/free-space-cache.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/fs/btrfs/free-space-cache.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf =20 while(1) { @@ -32951,9 +31766,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/free-space-ca= che.c linux-2.6.32.38/fs/btrfs/ =20 if (entry->bitmap && entry->bytes > bytes + empty_size) { ret =3D btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.32.38/fs/btrfs/inode.c linux-2.6.32.38/fs/btrfs/ino= de.c ---- linux-2.6.32.38/fs/btrfs/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/btrfs/inode.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/btrfs/inode.c linux-2.6.32.39/fs/btrfs/ino= de.c +--- linux-2.6.32.39/fs/btrfs/inode.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/btrfs/inode.c 2011-04-17 15:56:46.000000000 -0400 @@ -63,7 +63,7 @@ static const struct inode_operations btr static const struct address_space_operations btrfs_aops; static const struct address_space_operations btrfs_symlink_aops; @@ -32996,9 +31811,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/inode.c linux= -2.6.32.38/fs/btrfs/inode.c .fill_delalloc =3D run_delalloc_range, .submit_bio_hook =3D btrfs_submit_bio_hook, .merge_bio_hook =3D btrfs_merge_bio_hook, -diff -urNp linux-2.6.32.38/fs/btrfs/relocation.c linux-2.6.32.38/fs/btrf= s/relocation.c ---- linux-2.6.32.38/fs/btrfs/relocation.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/fs/btrfs/relocation.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/fs/btrfs/relocation.c linux-2.6.32.39/fs/btrf= s/relocation.c +--- linux-2.6.32.39/fs/btrfs/relocation.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/fs/btrfs/relocation.c 2011-04-17 15:56:46.000000000 = -0400 @@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt } spin_unlock(&rc->reloc_root_tree.lock); @@ -33008,9 +31823,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/relocation.c = linux-2.6.32.38/fs/btrfs/reloca =20 if (!del) { spin_lock(&rc->reloc_root_tree.lock); -diff -urNp linux-2.6.32.38/fs/btrfs/sysfs.c linux-2.6.32.38/fs/btrfs/sys= fs.c ---- linux-2.6.32.38/fs/btrfs/sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/btrfs/sysfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/btrfs/sysfs.c linux-2.6.32.39/fs/btrfs/sys= fs.c +--- linux-2.6.32.39/fs/btrfs/sysfs.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/btrfs/sysfs.c 2011-04-17 15:56:46.000000000 -0400 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -33026,9 +31841,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/sysfs.c linux= -2.6.32.38/fs/btrfs/sysfs.c .show =3D btrfs_root_attr_show, .store =3D btrfs_root_attr_store, }; -diff -urNp linux-2.6.32.38/fs/buffer.c linux-2.6.32.38/fs/buffer.c ---- linux-2.6.32.38/fs/buffer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/buffer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/buffer.c linux-2.6.32.39/fs/buffer.c +--- linux-2.6.32.39/fs/buffer.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/buffer.c 2011-04-17 15:56:46.000000000 -0400 @@ -25,6 +25,7 @@ #include #include @@ -33037,9 +31852,9 @@ diff -urNp linux-2.6.32.38/fs/buffer.c linux-2.6.= 32.38/fs/buffer.c #include #include #include -diff -urNp linux-2.6.32.38/fs/cachefiles/bind.c linux-2.6.32.38/fs/cache= files/bind.c ---- linux-2.6.32.38/fs/cachefiles/bind.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/fs/cachefiles/bind.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/fs/cachefiles/bind.c linux-2.6.32.39/fs/cache= files/bind.c +--- linux-2.6.32.39/fs/cachefiles/bind.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/fs/cachefiles/bind.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); =20 @@ -33056,9 +31871,9 @@ diff -urNp linux-2.6.32.38/fs/cachefiles/bind.c l= inux-2.6.32.38/fs/cachefiles/bi cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); =20 -diff -urNp linux-2.6.32.38/fs/cachefiles/daemon.c linux-2.6.32.38/fs/cac= hefiles/daemon.c ---- linux-2.6.32.38/fs/cachefiles/daemon.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/fs/cachefiles/daemon.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/fs/cachefiles/daemon.c linux-2.6.32.39/fs/cac= hefiles/daemon.c +--- linux-2.6.32.39/fs/cachefiles/daemon.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/fs/cachefiles/daemon.c 2011-04-17 15:56:46.000000000= -0400 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s if (test_bit(CACHEFILES_DEAD, &cache->flags)) return -EIO; @@ -33086,9 +31901,9 @@ diff -urNp linux-2.6.32.38/fs/cachefiles/daemon.c= linux-2.6.32.38/fs/cachefiles/ return cachefiles_daemon_range_error(cache, args); =20 cache->bstop_percent =3D bstop; -diff -urNp linux-2.6.32.38/fs/cachefiles/rdwr.c linux-2.6.32.38/fs/cache= files/rdwr.c ---- linux-2.6.32.38/fs/cachefiles/rdwr.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/fs/cachefiles/rdwr.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/fs/cachefiles/rdwr.c linux-2.6.32.39/fs/cache= files/rdwr.c +--- linux-2.6.32.39/fs/cachefiles/rdwr.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/fs/cachefiles/rdwr.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs =3D get_fs(); set_fs(KERNEL_DS); @@ -33098,21 +31913,9 @@ diff -urNp linux-2.6.32.38/fs/cachefiles/rdwr.c = linux-2.6.32.38/fs/cachefiles/rd set_fs(old_fs); kunmap(page); if (ret !=3D len) -diff -urNp linux-2.6.32.38/fs/cifs/cifs_uniupr.h linux-2.6.32.38/fs/cifs= /cifs_uniupr.h ---- linux-2.6.32.38/fs/cifs/cifs_uniupr.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/fs/cifs/cifs_uniupr.h 2011-04-17 15:56:46.000000000 = -0400 -@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa - {0x0490, 0x04cc, UniCaseRangeU0490}, - {0x1e00, 0x1ffc, UniCaseRangeU1e00}, - {0xff40, 0xff5a, UniCaseRangeUff40}, -- {0} -+ {0, 0, NULL} - }; - #endif -=20 -diff -urNp linux-2.6.32.38/fs/cifs/link.c linux-2.6.32.38/fs/cifs/link.c ---- linux-2.6.32.38/fs/cifs/link.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/cifs/link.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/cifs/link.c linux-2.6.32.39/fs/cifs/link.c +--- linux-2.6.32.39/fs/cifs/link.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/cifs/link.c 2011-04-17 15:56:46.000000000 -0400 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct =20 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void = *cookie) @@ -33122,9 +31925,9 @@ diff -urNp linux-2.6.32.38/fs/cifs/link.c linux-2= .6.32.38/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.32.38/fs/compat_binfmt_elf.c linux-2.6.32.38/fs/com= pat_binfmt_elf.c ---- linux-2.6.32.38/fs/compat_binfmt_elf.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/fs/compat_binfmt_elf.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/fs/compat_binfmt_elf.c linux-2.6.32.39/fs/com= pat_binfmt_elf.c +--- linux-2.6.32.39/fs/compat_binfmt_elf.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/fs/compat_binfmt_elf.c 2011-04-17 15:56:46.000000000= -0400 @@ -29,10 +29,12 @@ #undef elfhdr #undef elf_phdr @@ -33138,9 +31941,9 @@ diff -urNp linux-2.6.32.38/fs/compat_binfmt_elf.c= linux-2.6.32.38/fs/compat_binf #define elf_addr_t Elf32_Addr =20 /* -diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.32.38/fs/compat.c ---- linux-2.6.32.38/fs/compat.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/fs/compat.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/compat.c linux-2.6.32.39/fs/compat.c +--- linux-2.6.32.39/fs/compat.c 2011-04-17 17:00:52.000000000 -0400 ++++ linux-2.6.32.39/fs/compat.c 2011-04-23 13:29:24.000000000 -0400 @@ -830,6 +830,7 @@ struct compat_old_linux_dirent { =20 struct compat_readdir_callback { @@ -33231,15 +32034,7 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6= .32.38/fs/compat.c goto out; if (!file->f_op) goto out; -@@ -1422,6 +1440,7 @@ static int compat_copy_strings(int argc, -=20 - page =3D get_arg_page(bprm, pos, 1); - if (!page) { -+ /* We've exceed the stack rlimit. */ - ret =3D -E2BIG; - goto out; - } -@@ -1463,6 +1482,11 @@ int compat_do_execve(char * filename, +@@ -1463,6 +1481,11 @@ int compat_do_execve(char * filename, compat_uptr_t __user *envp, struct pt_regs * regs) { @@ -33251,7 +32046,7 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.= 32.38/fs/compat.c struct linux_binprm *bprm; struct file *file; struct files_struct *displaced; -@@ -1499,6 +1523,19 @@ int compat_do_execve(char * filename, +@@ -1499,6 +1522,19 @@ int compat_do_execve(char * filename, bprm->filename =3D filename; bprm->interp =3D filename; =20 @@ -33271,7 +32066,7 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.= 32.38/fs/compat.c retval =3D bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1528,9 +1565,40 @@ int compat_do_execve(char * filename, +@@ -1528,9 +1564,40 @@ int compat_do_execve(char * filename, if (retval < 0) goto out; =20 @@ -33313,7 +32108,7 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.= 32.38/fs/compat.c =20 /* execve succeeded */ current->fs->in_exec =3D 0; -@@ -1541,6 +1609,14 @@ int compat_do_execve(char * filename, +@@ -1541,6 +1608,14 @@ int compat_do_execve(char * filename, put_files_struct(displaced); return retval; =20 @@ -33328,9 +32123,9 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.= 32.38/fs/compat.c out: if (bprm->mm) { acct_arg_size(bprm, 0); -diff -urNp linux-2.6.32.38/fs/compat_ioctl.c linux-2.6.32.38/fs/compat_i= octl.c ---- linux-2.6.32.38/fs/compat_ioctl.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/compat_ioctl.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/fs/compat_ioctl.c linux-2.6.32.39/fs/compat_i= octl.c +--- linux-2.6.32.39/fs/compat_ioctl.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/fs/compat_ioctl.c 2011-04-23 12:56:11.000000000 -040= 0 @@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi up =3D (struct compat_video_spu_palette __user *) arg; err =3D get_user(palp, &up->palette); @@ -33340,29 +32135,19 @@ diff -urNp linux-2.6.32.38/fs/compat_ioctl.c li= nux-2.6.32.38/fs/compat_ioctl.c =20 up_native =3D compat_alloc_user_space(sizeof(struct video_spu_palette)= ); err =3D put_user(compat_ptr(palp), &up_native->palette); -@@ -1827,15 +1829,15 @@ struct ioctl_trans { - }; +diff -urNp linux-2.6.32.39/fs/dcache.c linux-2.6.32.39/fs/dcache.c +--- linux-2.6.32.39/fs/dcache.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/dcache.c 2011-04-23 13:32:21.000000000 -0400 +@@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock); =20 - #define HANDLE_IOCTL(cmd,handler) \ -- { (cmd), (ioctl_trans_handler_t)(handler) }, -+ { (cmd), (ioctl_trans_handler_t)(handler), NULL }, + static struct kmem_cache *dentry_cache __read_mostly; =20 - /* pointer to compatible structure or no argument */ - #define COMPATIBLE_IOCTL(cmd) \ -- { (cmd), do_ioctl32_pointer }, -+ { (cmd), do_ioctl32_pointer, NULL }, -=20 - /* argument is an unsigned long integer, not a pointer */ - #define ULONG_IOCTL(cmd) \ -- { (cmd), (ioctl_trans_handler_t)sys_ioctl }, -+ { (cmd), (ioctl_trans_handler_t)sys_ioctl, NULL }, -=20 - /* ioctl should not be warned about even if it's not implemented. - Valid reasons to use this: -diff -urNp linux-2.6.32.38/fs/dcache.c linux-2.6.32.38/fs/dcache.c ---- linux-2.6.32.38/fs/dcache.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/dcache.c 2011-04-17 15:56:46.000000000 -0400 -@@ -2319,7 +2319,7 @@ void __init vfs_caches_init(unsigned lon +-#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,= d_iname)) +- + /* + * This is the single most critical data structure when it comes + * to the dcache: the hashtable for lookups. Somebody should try +@@ -2319,7 +2317,7 @@ void __init vfs_caches_init(unsigned lon mempages -=3D reserve; =20 names_cachep =3D kmem_cache_create("names_cache", PATH_MAX, 0, @@ -33371,21 +32156,9 @@ diff -urNp linux-2.6.32.38/fs/dcache.c linux-2.6= .32.38/fs/dcache.c =20 dcache_init(); inode_init(); -diff -urNp linux-2.6.32.38/fs/debugfs/inode.c linux-2.6.32.38/fs/debugfs= /inode.c ---- linux-2.6.32.38/fs/debugfs/inode.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/debugfs/inode.c 2011-04-17 15:56:46.000000000 -04= 00 -@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc -=20 - static int debug_fill_super(struct super_block *sb, void *data, int sil= ent) - { -- static struct tree_descr debug_files[] =3D {{""}}; -+ static struct tree_descr debug_files[] =3D {{"", NULL, 0}}; -=20 - return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); - } -diff -urNp linux-2.6.32.38/fs/dlm/lockspace.c linux-2.6.32.38/fs/dlm/loc= kspace.c ---- linux-2.6.32.38/fs/dlm/lockspace.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/dlm/lockspace.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/fs/dlm/lockspace.c linux-2.6.32.39/fs/dlm/loc= kspace.c +--- linux-2.6.32.39/fs/dlm/lockspace.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/fs/dlm/lockspace.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -33395,9 +32168,9 @@ diff -urNp linux-2.6.32.38/fs/dlm/lockspace.c lin= ux-2.6.32.38/fs/dlm/lockspace.c .show =3D dlm_attr_show, .store =3D dlm_attr_store, }; -diff -urNp linux-2.6.32.38/fs/ecryptfs/inode.c linux-2.6.32.38/fs/ecrypt= fs/inode.c ---- linux-2.6.32.38/fs/ecryptfs/inode.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/fs/ecryptfs/inode.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/fs/ecryptfs/inode.c linux-2.6.32.39/fs/ecrypt= fs/inode.c +--- linux-2.6.32.39/fs/ecryptfs/inode.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/fs/ecryptfs/inode.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc old_fs =3D get_fs(); set_fs(get_ds()); @@ -33416,9 +32189,9 @@ diff -urNp linux-2.6.32.38/fs/ecryptfs/inode.c li= nux-2.6.32.38/fs/ecryptfs/inode set_fs(old_fs); if (rc < 0) goto out_free; -diff -urNp linux-2.6.32.38/fs/exec.c linux-2.6.32.38/fs/exec.c ---- linux-2.6.32.38/fs/exec.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/fs/exec.c 2011-04-17 17:07:23.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/exec.c linux-2.6.32.39/fs/exec.c +--- linux-2.6.32.39/fs/exec.c 2011-04-17 17:00:52.000000000 -0400 ++++ linux-2.6.32.39/fs/exec.c 2011-04-23 13:35:12.000000000 -0400 @@ -56,12 +56,24 @@ #include #include @@ -33694,7 +32467,7 @@ diff -urNp linux-2.6.32.38/fs/exec.c linux-2.6.32= .38/fs/exec.c =20 /* execve succeeded */ current->fs->in_exec =3D 0; -@@ -1429,10 +1511,18 @@ int do_execve(char * filename, +@@ -1429,6 +1511,14 @@ int do_execve(char * filename, put_files_struct(displaced); return retval; =20 @@ -33709,11 +32482,6 @@ diff -urNp linux-2.6.32.38/fs/exec.c linux-2.6.3= 2.38/fs/exec.c out: if (bprm->mm) { acct_arg_size(bprm, 0); -- mmput(bprm->mm); -+ mmput (bprm->mm); - } -=20 - out_file: @@ -1594,6 +1684,209 @@ out: return ispipe; } @@ -33966,9 +32734,9 @@ diff -urNp linux-2.6.32.38/fs/exec.c linux-2.6.32= .38/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, wh= ich * uses lock_kernel() -diff -urNp linux-2.6.32.38/fs/ext2/balloc.c linux-2.6.32.38/fs/ext2/ball= oc.c ---- linux-2.6.32.38/fs/ext2/balloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext2/balloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ext2/balloc.c linux-2.6.32.39/fs/ext2/ball= oc.c +--- linux-2.6.32.39/fs/ext2/balloc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ext2/balloc.c 2011-04-17 15:56:46.000000000 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e =20 free_blocks =3D percpu_counter_read_positive(&sbi->s_freeblocks_counte= r); @@ -33978,23 +32746,9 @@ diff -urNp linux-2.6.32.38/fs/ext2/balloc.c linu= x-2.6.32.38/fs/ext2/balloc.c sbi->s_resuid !=3D current_fsuid() && (sbi->s_resgid =3D=3D 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.38/fs/ext2/xattr.c linux-2.6.32.38/fs/ext2/xattr= .c ---- linux-2.6.32.38/fs/ext2/xattr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext2/xattr.c 2011-04-17 15:56:46.000000000 -0400 -@@ -85,8 +85,8 @@ - printk("\n"); \ - } while (0) - #else --# define ea_idebug(f...) --# define ea_bdebug(f...) -+# define ea_idebug(inode, f...) do {} while (0) -+# define ea_bdebug(bh, f...) do {} while (0) - #endif -=20 - static int ext2_xattr_set2(struct inode *, struct buffer_head *, -diff -urNp linux-2.6.32.38/fs/ext3/balloc.c linux-2.6.32.38/fs/ext3/ball= oc.c ---- linux-2.6.32.38/fs/ext3/balloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext3/balloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ext3/balloc.c linux-2.6.32.39/fs/ext3/ball= oc.c +--- linux-2.6.32.39/fs/ext3/balloc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ext3/balloc.c 2011-04-17 15:56:46.000000000 -0400 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e =20 free_blocks =3D percpu_counter_read_positive(&sbi->s_freeblocks_counte= r); @@ -34004,35 +32758,9 @@ diff -urNp linux-2.6.32.38/fs/ext3/balloc.c linu= x-2.6.32.38/fs/ext3/balloc.c sbi->s_resuid !=3D current_fsuid() && (sbi->s_resgid =3D=3D 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.38/fs/ext3/namei.c linux-2.6.32.38/fs/ext3/namei= .c ---- linux-2.6.32.38/fs/ext3/namei.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext3/namei.c 2011-04-17 15:56:46.000000000 -0400 -@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split - char *data1 =3D (*bh)->b_data, *data2; - unsigned split, move, size; - struct ext3_dir_entry_2 *de =3D NULL, *de2; -- int err =3D 0, i; -+ int i, err =3D 0; -=20 - bh2 =3D ext3_append (handle, dir, &newblock, &err); - if (!(bh2)) { -diff -urNp linux-2.6.32.38/fs/ext3/xattr.c linux-2.6.32.38/fs/ext3/xattr= .c ---- linux-2.6.32.38/fs/ext3/xattr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext3/xattr.c 2011-04-17 15:56:46.000000000 -0400 -@@ -89,8 +89,8 @@ - printk("\n"); \ - } while (0) - #else --# define ea_idebug(f...) --# define ea_bdebug(f...) -+# define ea_idebug(f...) do {} while (0) -+# define ea_bdebug(f...) do {} while (0) - #endif -=20 - static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.38/fs/ext4/balloc.c linux-2.6.32.38/fs/ext4/ball= oc.c ---- linux-2.6.32.38/fs/ext4/balloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext4/balloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ext4/balloc.c linux-2.6.32.39/fs/ext4/ball= oc.c +--- linux-2.6.32.39/fs/ext4/balloc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ext4/balloc.c 2011-04-17 15:56:46.000000000 -0400 @@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid =3D=3D current_fsuid() || @@ -34042,9 +32770,9 @@ diff -urNp linux-2.6.32.38/fs/ext4/balloc.c linux= -2.6.32.38/fs/ext4/balloc.c if (free_blocks >=3D (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.32.38/fs/ext4/ext4.h linux-2.6.32.38/fs/ext4/ext4.h ---- linux-2.6.32.38/fs/ext4/ext4.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext4/ext4.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ext4/ext4.h linux-2.6.32.39/fs/ext4/ext4.h +--- linux-2.6.32.39/fs/ext4/ext4.h 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ext4/ext4.h 2011-04-17 15:56:46.000000000 -0400 @@ -1078,19 +1078,19 @@ struct ext4_sb_info { =20 /* stats for buddy allocator */ @@ -34075,9 +32803,9 @@ diff -urNp linux-2.6.32.38/fs/ext4/ext4.h linux-2= .6.32.38/fs/ext4/ext4.h atomic_t s_lock_busy; =20 /* locality groups */ -diff -urNp linux-2.6.32.38/fs/ext4/mballoc.c linux-2.6.32.38/fs/ext4/mba= lloc.c ---- linux-2.6.32.38/fs/ext4/mballoc.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/ext4/mballoc.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/fs/ext4/mballoc.c linux-2.6.32.39/fs/ext4/mba= lloc.c +--- linux-2.6.32.39/fs/ext4/mballoc.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/fs/ext4/mballoc.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -1753,7 +1753,7 @@ void ext4_mb_simple_scan_group(struct ex BUG_ON(ac->ac_b_ex.fe_len !=3D ac->ac_g_ex.fe_len); =20 @@ -34191,21 +32919,9 @@ diff -urNp linux-2.6.32.38/fs/ext4/mballoc.c lin= ux-2.6.32.38/fs/ext4/mballoc.c =20 if (ac) { ac->ac_sb =3D sb; -diff -urNp linux-2.6.32.38/fs/ext4/namei.c linux-2.6.32.38/fs/ext4/namei= .c ---- linux-2.6.32.38/fs/ext4/namei.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext4/namei.c 2011-04-17 15:56:46.000000000 -0400 -@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split - char *data1 =3D (*bh)->b_data, *data2; - unsigned split, move, size; - struct ext4_dir_entry_2 *de =3D NULL, *de2; -- int err =3D 0, i; -+ int i, err =3D 0; -=20 - bh2 =3D ext4_append (handle, dir, &newblock, &err); - if (!(bh2)) { -diff -urNp linux-2.6.32.38/fs/ext4/super.c linux-2.6.32.38/fs/ext4/super= .c ---- linux-2.6.32.38/fs/ext4/super.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext4/super.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ext4/super.c linux-2.6.32.39/fs/ext4/super= .c +--- linux-2.6.32.39/fs/ext4/super.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ext4/super.c 2011-04-17 15:56:46.000000000 -0400 @@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje } =20 @@ -34215,23 +32931,9 @@ diff -urNp linux-2.6.32.38/fs/ext4/super.c linux= -2.6.32.38/fs/ext4/super.c .show =3D ext4_attr_show, .store =3D ext4_attr_store, }; -diff -urNp linux-2.6.32.38/fs/ext4/xattr.c linux-2.6.32.38/fs/ext4/xattr= .c ---- linux-2.6.32.38/fs/ext4/xattr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ext4/xattr.c 2011-04-17 15:56:46.000000000 -0400 -@@ -82,8 +82,8 @@ - printk("\n"); \ - } while (0) - #else --# define ea_idebug(f...) --# define ea_bdebug(f...) -+# define ea_idebug(inode, f...) do {} while (0) -+# define ea_bdebug(bh, f...) do {} while (0) - #endif -=20 - static void ext4_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.38/fs/fcntl.c linux-2.6.32.38/fs/fcntl.c ---- linux-2.6.32.38/fs/fcntl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/fcntl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/fcntl.c linux-2.6.32.39/fs/fcntl.c +--- linux-2.6.32.39/fs/fcntl.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/fcntl.c 2011-04-17 15:56:46.000000000 -0400 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct if (err) return err; @@ -34252,9 +32954,9 @@ diff -urNp linux-2.6.32.38/fs/fcntl.c linux-2.6.3= 2.38/fs/fcntl.c if (arg >=3D current->signal->rlim[RLIMIT_NOFILE].rlim_cur) break; err =3D alloc_fd(arg, cmd =3D=3D F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); -diff -urNp linux-2.6.32.38/fs/fifo.c linux-2.6.32.38/fs/fifo.c ---- linux-2.6.32.38/fs/fifo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/fifo.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/fifo.c linux-2.6.32.39/fs/fifo.c +--- linux-2.6.32.39/fs/fifo.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/fifo.c 2011-04-17 15:56:46.000000000 -0400 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ filp->f_op =3D &read_pipefifo_fops; @@ -34325,9 +33027,9 @@ diff -urNp linux-2.6.32.38/fs/fifo.c linux-2.6.32= .38/fs/fifo.c free_pipe_info(inode); =20 err_nocleanup: -diff -urNp linux-2.6.32.38/fs/file.c linux-2.6.32.38/fs/file.c ---- linux-2.6.32.38/fs/file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/file.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/file.c linux-2.6.32.39/fs/file.c +--- linux-2.6.32.39/fs/file.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/file.c 2011-04-17 15:56:46.000000000 -0400 @@ -14,6 +14,7 @@ #include #include @@ -34345,9 +33047,9 @@ diff -urNp linux-2.6.32.38/fs/file.c linux-2.6.32= .38/fs/file.c if (nr >=3D current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; =20 -diff -urNp linux-2.6.32.38/fs/filesystems.c linux-2.6.32.38/fs/filesyste= ms.c ---- linux-2.6.32.38/fs/filesystems.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/filesystems.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/filesystems.c linux-2.6.32.39/fs/filesyste= ms.c +--- linux-2.6.32.39/fs/filesystems.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/filesystems.c 2011-04-17 15:56:46.000000000 -0400 @@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(con int len =3D dot ? dot - name : strlen(name); =20 @@ -34361,9 +33063,9 @@ diff -urNp linux-2.6.32.38/fs/filesystems.c linux= -2.6.32.38/fs/filesystems.c fs =3D __get_fs_type(name, len); =20 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { -diff -urNp linux-2.6.32.38/fs/fs_struct.c linux-2.6.32.38/fs/fs_struct.c ---- linux-2.6.32.38/fs/fs_struct.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/fs_struct.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/fs_struct.c linux-2.6.32.39/fs/fs_struct.c +--- linux-2.6.32.39/fs/fs_struct.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/fs_struct.c 2011-04-17 15:56:46.000000000 -0400 @@ -4,6 +4,7 @@ #include #include @@ -34443,21 +33145,9 @@ diff -urNp linux-2.6.32.38/fs/fs_struct.c linux-= 2.6.32.38/fs/fs_struct.c write_unlock(&fs->lock); =20 task_unlock(current); -diff -urNp linux-2.6.32.38/fs/fuse/control.c linux-2.6.32.38/fs/fuse/con= trol.c ---- linux-2.6.32.38/fs/fuse/control.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/fuse/control.c 2011-04-17 15:56:46.000000000 -040= 0 -@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co -=20 - static int fuse_ctl_fill_super(struct super_block *sb, void *data, int = silent) - { -- struct tree_descr empty_descr =3D {""}; -+ struct tree_descr empty_descr =3D {"", NULL, 0}; - struct fuse_conn *fc; - int err; -=20 -diff -urNp linux-2.6.32.38/fs/fuse/cuse.c linux-2.6.32.38/fs/fuse/cuse.c ---- linux-2.6.32.38/fs/fuse/cuse.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/fuse/cuse.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/fuse/cuse.c linux-2.6.32.39/fs/fuse/cuse.c +--- linux-2.6.32.39/fs/fuse/cuse.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/fuse/cuse.c 2011-04-17 15:56:46.000000000 -0400 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i return rc; } @@ -34492,9 +33182,9 @@ diff -urNp linux-2.6.32.38/fs/fuse/cuse.c linux-2= .6.32.38/fs/fuse/cuse.c cuse_class =3D class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.32.38/fs/fuse/dev.c linux-2.6.32.38/fs/fuse/dev.c ---- linux-2.6.32.38/fs/fuse/dev.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/fuse/dev.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/fuse/dev.c linux-2.6.32.39/fs/fuse/dev.c +--- linux-2.6.32.39/fs/fuse/dev.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/fuse/dev.c 2011-04-17 15:56:46.000000000 -0400 @@ -745,7 +745,7 @@ __releases(&fc->lock) * request_end(). Otherwise add it to the processing list, and set * the 'sent' flag. @@ -34600,9 +33290,9 @@ diff -urNp linux-2.6.32.38/fs/fuse/dev.c linux-2.= 6.32.38/fs/fuse/dev.c =20 const struct file_operations fuse_dev_operations =3D { .owner =3D THIS_MODULE, -diff -urNp linux-2.6.32.38/fs/fuse/dir.c linux-2.6.32.38/fs/fuse/dir.c ---- linux-2.6.32.38/fs/fuse/dir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/fuse/dir.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/fuse/dir.c linux-2.6.32.39/fs/fuse/dir.c +--- linux-2.6.32.39/fs/fuse/dir.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/fuse/dir.c 2011-04-17 15:56:46.000000000 -0400 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -34612,9 +33302,9 @@ diff -urNp linux-2.6.32.38/fs/fuse/dir.c linux-2.= 6.32.38/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.32.38/fs/fuse/fuse_i.h linux-2.6.32.38/fs/fuse/fuse= _i.h ---- linux-2.6.32.38/fs/fuse/fuse_i.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/fuse/fuse_i.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/fuse/fuse_i.h linux-2.6.32.39/fs/fuse/fuse= _i.h +--- linux-2.6.32.39/fs/fuse/fuse_i.h 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/fuse/fuse_i.h 2011-04-17 15:56:46.000000000 -0400 @@ -525,6 +525,16 @@ extern const struct file_operations fuse =20 extern const struct dentry_operations fuse_dentry_operations; @@ -34632,9 +33322,9 @@ diff -urNp linux-2.6.32.38/fs/fuse/fuse_i.h linux= -2.6.32.38/fs/fuse/fuse_i.h /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.32.38/fs/gfs2/sys.c linux-2.6.32.38/fs/gfs2/sys.c ---- linux-2.6.32.38/fs/gfs2/sys.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/gfs2/sys.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/gfs2/sys.c linux-2.6.32.39/fs/gfs2/sys.c +--- linux-2.6.32.39/fs/gfs2/sys.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/gfs2/sys.c 2011-04-17 15:56:46.000000000 -0400 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -34653,69 +33343,9 @@ diff -urNp linux-2.6.32.38/fs/gfs2/sys.c linux-2= .6.32.38/fs/gfs2/sys.c .uevent =3D gfs2_uevent, }; =20 -diff -urNp linux-2.6.32.38/fs/hfs/inode.c linux-2.6.32.38/fs/hfs/inode.c ---- linux-2.6.32.38/fs/hfs/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/hfs/inode.c 2011-04-17 15:56:46.000000000 -0400 -@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, -=20 - if (S_ISDIR(main_inode->i_mode)) { - if (fd.entrylength < sizeof(struct hfs_cat_dir)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, - sizeof(struct hfs_cat_dir)); - if (rec.type !=3D HFS_CDR_DIR || -@@ -444,7 +444,7 @@ int hfs_write_inode(struct inode *inode, - sizeof(struct hfs_cat_file)); - } else { - if (fd.entrylength < sizeof(struct hfs_cat_file)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, - sizeof(struct hfs_cat_file)); - if (rec.type !=3D HFS_CDR_FIL || -diff -urNp linux-2.6.32.38/fs/hfsplus/inode.c linux-2.6.32.38/fs/hfsplus= /inode.c ---- linux-2.6.32.38/fs/hfsplus/inode.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/hfsplus/inode.c 2011-04-17 15:56:46.000000000 -04= 00 -@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode=20 - struct hfsplus_cat_folder *folder =3D &entry.folder; -=20 - if (fd->entrylength < sizeof(struct hfsplus_cat_folder)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, - sizeof(struct hfsplus_cat_folder)); - hfsplus_get_perms(inode, &folder->permissions, 1); -@@ -423,7 +423,7 @@ int hfsplus_cat_read_inode(struct inode=20 - struct hfsplus_cat_file *file =3D &entry.file; -=20 - if (fd->entrylength < sizeof(struct hfsplus_cat_file)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, - sizeof(struct hfsplus_cat_file)); -=20 -@@ -479,7 +479,7 @@ int hfsplus_cat_write_inode(struct inode - struct hfsplus_cat_folder *folder =3D &entry.folder; -=20 - if (fd.entrylength < sizeof(struct hfsplus_cat_folder)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, - sizeof(struct hfsplus_cat_folder)); - /* simple node checks? */ -@@ -501,7 +501,7 @@ int hfsplus_cat_write_inode(struct inode - struct hfsplus_cat_file *file =3D &entry.file; -=20 - if (fd.entrylength < sizeof(struct hfsplus_cat_file)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, - sizeof(struct hfsplus_cat_file)); - hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.32.38/fs/hugetlbfs/inode.c linux-2.6.32.38/fs/huget= lbfs/inode.c ---- linux-2.6.32.38/fs/hugetlbfs/inode.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/fs/hugetlbfs/inode.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/fs/hugetlbfs/inode.c linux-2.6.32.39/fs/huget= lbfs/inode.c +--- linux-2.6.32.39/fs/hugetlbfs/inode.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/fs/hugetlbfs/inode.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs .kill_sb =3D kill_litter_super, }; @@ -34725,9 +33355,9 @@ diff -urNp linux-2.6.32.38/fs/hugetlbfs/inode.c l= inux-2.6.32.38/fs/hugetlbfs/ino =20 static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.32.38/fs/ioctl.c linux-2.6.32.38/fs/ioctl.c ---- linux-2.6.32.38/fs/ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ioctl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ioctl.c linux-2.6.32.39/fs/ioctl.c +--- linux-2.6.32.39/fs/ioctl.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ioctl.c 2011-04-17 15:56:46.000000000 -0400 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -34755,113 +33385,9 @@ diff -urNp linux-2.6.32.38/fs/ioctl.c linux-2.6= .32.38/fs/ioctl.c error =3D -EFAULT; =20 return error; -diff -urNp linux-2.6.32.38/fs/jffs2/debug.h linux-2.6.32.38/fs/jffs2/deb= ug.h ---- linux-2.6.32.38/fs/jffs2/debug.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/jffs2/debug.h 2011-04-17 15:56:46.000000000 -0400 -@@ -52,13 +52,13 @@ - #if CONFIG_JFFS2_FS_DEBUG > 0 - #define D1(x) x - #else --#define D1(x) -+#define D1(x) do {} while (0); - #endif -=20 - #if CONFIG_JFFS2_FS_DEBUG > 1 - #define D2(x) x - #else --#define D2(x) -+#define D2(x) do {} while (0); - #endif -=20 - /* The prefixes of JFFS2 messages */ -@@ -114,73 +114,73 @@ - #ifdef JFFS2_DBG_READINODE_MESSAGES - #define dbg_readinode(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_readinode(fmt, ...) -+#define dbg_readinode(fmt, ...) do {} while (0) - #endif - #ifdef JFFS2_DBG_READINODE2_MESSAGES - #define dbg_readinode2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_readinode2(fmt, ...) -+#define dbg_readinode2(fmt, ...) do {} while (0) - #endif -=20 - /* Fragtree build debugging messages */ - #ifdef JFFS2_DBG_FRAGTREE_MESSAGES - #define dbg_fragtree(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_fragtree(fmt, ...) -+#define dbg_fragtree(fmt, ...) do {} while (0) - #endif - #ifdef JFFS2_DBG_FRAGTREE2_MESSAGES - #define dbg_fragtree2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_fragtree2(fmt, ...) -+#define dbg_fragtree2(fmt, ...) do {} while (0) - #endif -=20 - /* Directory entry list manilulation debugging messages */ - #ifdef JFFS2_DBG_DENTLIST_MESSAGES - #define dbg_dentlist(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_dentlist(fmt, ...) -+#define dbg_dentlist(fmt, ...) do {} while (0) - #endif -=20 - /* Print the messages about manipulating node_refs */ - #ifdef JFFS2_DBG_NODEREF_MESSAGES - #define dbg_noderef(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_noderef(fmt, ...) -+#define dbg_noderef(fmt, ...) do {} while (0) - #endif -=20 - /* Manipulations with the list of inodes (JFFS2 inocache) */ - #ifdef JFFS2_DBG_INOCACHE_MESSAGES - #define dbg_inocache(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_inocache(fmt, ...) -+#define dbg_inocache(fmt, ...) do {} while (0) - #endif -=20 - /* Summary debugging messages */ - #ifdef JFFS2_DBG_SUMMARY_MESSAGES - #define dbg_summary(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_summary(fmt, ...) -+#define dbg_summary(fmt, ...) do {} while (0) - #endif -=20 - /* File system build messages */ - #ifdef JFFS2_DBG_FSBUILD_MESSAGES - #define dbg_fsbuild(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_fsbuild(fmt, ...) -+#define dbg_fsbuild(fmt, ...) do {} while (0) - #endif -=20 - /* Watch the object allocations */ - #ifdef JFFS2_DBG_MEMALLOC_MESSAGES - #define dbg_memalloc(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_memalloc(fmt, ...) -+#define dbg_memalloc(fmt, ...) do {} while (0) - #endif -=20 - /* Watch the XATTR subsystem */ - #ifdef JFFS2_DBG_XATTR_MESSAGES - #define dbg_xattr(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_xattr(fmt, ...) -+#define dbg_xattr(fmt, ...) do {} while (0) - #endif=20 -=20 - /* "Sanity" checks */ -diff -urNp linux-2.6.32.38/fs/jffs2/erase.c linux-2.6.32.38/fs/jffs2/era= se.c ---- linux-2.6.32.38/fs/jffs2/erase.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/jffs2/erase.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/jffs2/erase.c linux-2.6.32.39/fs/jffs2/era= se.c +--- linux-2.6.32.39/fs/jffs2/erase.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/jffs2/erase.c 2011-04-17 15:56:46.000000000 -0400 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker =3D { .magic =3D cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -34872,40 +33398,9 @@ diff -urNp linux-2.6.32.38/fs/jffs2/erase.c linu= x-2.6.32.38/fs/jffs2/erase.c }; =20 jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.32.38/fs/jffs2/summary.h linux-2.6.32.38/fs/jffs2/s= ummary.h ---- linux-2.6.32.38/fs/jffs2/summary.h 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/jffs2/summary.h 2011-04-17 15:56:46.000000000 -04= 00 -@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ -=20 - #define jffs2_sum_active() (0) - #define jffs2_sum_init(a) (0) --#define jffs2_sum_exit(a) --#define jffs2_sum_disable_collecting(a) -+#define jffs2_sum_exit(a) do {} while (0) -+#define jffs2_sum_disable_collecting(a) do {} while (0) - #define jffs2_sum_is_disabled(a) (0) --#define jffs2_sum_reset_collected(a) -+#define jffs2_sum_reset_collected(a) do {} while (0) - #define jffs2_sum_add_kvec(a,b,c,d) (0) --#define jffs2_sum_move_collected(a,b) -+#define jffs2_sum_move_collected(a,b) do {} while (0) - #define jffs2_sum_write_sumnode(a) (0) --#define jffs2_sum_add_padding_mem(a,b) --#define jffs2_sum_add_inode_mem(a,b,c) --#define jffs2_sum_add_dirent_mem(a,b,c) --#define jffs2_sum_add_xattr_mem(a,b,c) --#define jffs2_sum_add_xref_mem(a,b,c) -+#define jffs2_sum_add_padding_mem(a,b) do {} while (0) -+#define jffs2_sum_add_inode_mem(a,b,c) do {} while (0) -+#define jffs2_sum_add_dirent_mem(a,b,c) do {} while (0) -+#define jffs2_sum_add_xattr_mem(a,b,c) do {} while (0) -+#define jffs2_sum_add_xref_mem(a,b,c) do {} while (0) - #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) -=20 - #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.32.38/fs/jffs2/wbuf.c linux-2.6.32.38/fs/jffs2/wbuf= .c ---- linux-2.6.32.38/fs/jffs2/wbuf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/jffs2/wbuf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/jffs2/wbuf.c linux-2.6.32.39/fs/jffs2/wbuf= .c +--- linux-2.6.32.39/fs/jffs2/wbuf.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/jffs2/wbuf.c 2011-04-17 15:56:46.000000000 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic =3D constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -34916,9 +33411,9 @@ diff -urNp linux-2.6.32.38/fs/jffs2/wbuf.c linux-= 2.6.32.38/fs/jffs2/wbuf.c }; =20 /* -diff -urNp linux-2.6.32.38/fs/Kconfig.binfmt linux-2.6.32.38/fs/Kconfig.= binfmt ---- linux-2.6.32.38/fs/Kconfig.binfmt 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/Kconfig.binfmt 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/fs/Kconfig.binfmt linux-2.6.32.39/fs/Kconfig.= binfmt +--- linux-2.6.32.39/fs/Kconfig.binfmt 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/fs/Kconfig.binfmt 2011-04-17 15:56:46.000000000 -040= 0 @@ -86,7 +86,7 @@ config HAVE_AOUT =20 config BINFMT_AOUT @@ -34928,14 +33423,14 @@ diff -urNp linux-2.6.32.38/fs/Kconfig.binfmt li= nux-2.6.32.38/fs/Kconfig.binfmt ---help--- A.out (Assembler.OUTput) is a set of formats for libraries and executables used in the earliest versions of UNIX. Linux used -diff -urNp linux-2.6.32.38/fs/libfs.c linux-2.6.32.38/fs/libfs.c ---- linux-2.6.32.38/fs/libfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/libfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/libfs.c linux-2.6.32.39/fs/libfs.c +--- linux-2.6.32.39/fs/libfs.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/libfs.c 2011-04-23 13:36:01.000000000 -0400 @@ -132,6 +132,8 @@ int dcache_readdir(struct file * filp, v struct dentry *dentry =3D filp->f_path.dentry; struct dentry *cursor =3D filp->private_data; struct list_head *p, *q =3D &cursor->d_u.d_child; -+ char d_name[DNAME_INLINE_LEN_MIN]; ++ char d_name[DNAME_INLINE_LEN]; + const char *name; ino_t ino; int i =3D filp->f_pos; @@ -34945,18 +33440,18 @@ diff -urNp linux-2.6.32.38/fs/libfs.c linux-2.6= .32.38/fs/libfs.c =20 spin_unlock(&dcache_lock); - if (filldir(dirent, next->d_name.name,=20 -+ if (next->d_name.len < DNAME_INLINE_LEN_MIN) { ++ if (next->d_name.len < DNAME_INLINE_LEN) { + memcpy(d_name, next->d_name.name, next->d_name.len); + name =3D d_name; + } else + name =3D next->d_name.name; -+ if (filldir(dirent, name, ++ if (filldir(dirent, name,=20 next->d_name.len, filp->f_pos,=20 next->d_inode->i_ino,=20 dt_type(next->d_inode)) < 0) -diff -urNp linux-2.6.32.38/fs/lockd/svc.c linux-2.6.32.38/fs/lockd/svc.c ---- linux-2.6.32.38/fs/lockd/svc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/lockd/svc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/lockd/svc.c linux-2.6.32.39/fs/lockd/svc.c +--- linux-2.6.32.39/fs/lockd/svc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/lockd/svc.c 2011-04-17 15:56:46.000000000 -0400 @@ -43,7 +43,7 @@ =20 static struct svc_program nlmsvc_program; @@ -34966,9 +33461,9 @@ diff -urNp linux-2.6.32.38/fs/lockd/svc.c linux-2= .6.32.38/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); =20 static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.32.38/fs/locks.c linux-2.6.32.38/fs/locks.c ---- linux-2.6.32.38/fs/locks.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/locks.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/locks.c linux-2.6.32.39/fs/locks.c +--- linux-2.6.32.39/fs/locks.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/locks.c 2011-04-17 15:56:46.000000000 -0400 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil return; =20 @@ -34990,9 +33485,9 @@ diff -urNp linux-2.6.32.38/fs/locks.c linux-2.6.3= 2.38/fs/locks.c } =20 lock_kernel(); -diff -urNp linux-2.6.32.38/fs/namei.c linux-2.6.32.38/fs/namei.c ---- linux-2.6.32.38/fs/namei.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/namei.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/namei.c linux-2.6.32.39/fs/namei.c +--- linux-2.6.32.39/fs/namei.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/namei.c 2011-04-17 15:56:46.000000000 -0400 @@ -224,14 +224,6 @@ int generic_permission(struct inode *ino return ret; =20 @@ -35419,9 +33914,9 @@ diff -urNp linux-2.6.32.38/fs/namei.c linux-2.6.3= 2.38/fs/namei.c len =3D -EFAULT; out: return len; -diff -urNp linux-2.6.32.38/fs/namespace.c linux-2.6.32.38/fs/namespace.c ---- linux-2.6.32.38/fs/namespace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/namespace.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/namespace.c linux-2.6.32.39/fs/namespace.c +--- linux-2.6.32.39/fs/namespace.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/namespace.c 2011-04-17 15:56:46.000000000 -0400 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval =3D do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -35482,9 +33977,9 @@ diff -urNp linux-2.6.32.38/fs/namespace.c linux-2= .6.32.38/fs/namespace.c read_lock(¤t->fs->lock); root =3D current->fs->root; path_get(¤t->fs->root); -diff -urNp linux-2.6.32.38/fs/nfs/inode.c linux-2.6.32.38/fs/nfs/inode.c ---- linux-2.6.32.38/fs/nfs/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/nfs/inode.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/nfs/inode.c linux-2.6.32.39/fs/nfs/inode.c +--- linux-2.6.32.39/fs/nfs/inode.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/nfs/inode.c 2011-04-17 15:56:46.000000000 -0400 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -35505,282 +34000,9 @@ diff -urNp linux-2.6.32.38/fs/nfs/inode.c linux= -2.6.32.38/fs/nfs/inode.c } =20 void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.32.38/fs/nfs/nfs4proc.c linux-2.6.32.38/fs/nfs/nfs4= proc.c ---- linux-2.6.32.38/fs/nfs/nfs4proc.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/nfs/nfs4proc.c 2011-04-17 15:56:46.000000000 -040= 0 -@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct=20 - static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nf= s4_state *state) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D _nfs4_do_open_reclaim(ctx, state); -@@ -1173,7 +1173,7 @@ static int _nfs4_open_delegation_recall( -=20 - int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nf= s4_state *state, const nfs4_stateid *stateid) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - struct nfs_server *server =3D NFS_SERVER(state->inode); - int err; - do { -@@ -1493,7 +1493,7 @@ static int _nfs4_open_expired(struct nfs - static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, st= ruct nfs4_state *state) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -1593,7 +1593,7 @@ out_err: -=20 - static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *= path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cre= d) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - struct nfs4_state *res; - int status; -=20 -@@ -1684,7 +1684,7 @@ static int nfs4_do_setattr(struct inode=20 - struct nfs4_state *state) - { - struct nfs_server *server =3D NFS_SERVER(inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2050,7 +2050,7 @@ static int _nfs4_server_capabilities(str -=20 - int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *= fhandle) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2084,7 +2084,7 @@ static int _nfs4_lookup_root(struct nfs_ - static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *f= handle, - struct nfs_fsinfo *info) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2173,7 +2173,7 @@ static int _nfs4_proc_getattr(struct nfs -=20 - static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *= fhandle, struct nfs_fattr *fattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2261,7 +2261,7 @@ static int nfs4_proc_lookupfh(struct nfs - struct qstr *name, struct nfs_fh *fhandle, - struct nfs_fattr *fattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); -@@ -2290,7 +2290,7 @@ static int _nfs4_proc_lookup(struct inod -=20 - static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struc= t nfs_fh *fhandle, struct nfs_fattr *fattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dir), -@@ -2354,7 +2354,7 @@ static int _nfs4_proc_access(struct inod -=20 - static int nfs4_proc_access(struct inode *inode, struct nfs_access_entr= y *entry) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(inode), -@@ -2410,7 +2410,7 @@ static int _nfs4_proc_readlink(struct in - static int nfs4_proc_readlink(struct inode *inode, struct page *page, - unsigned int pgbase, unsigned int pglen) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(inode), -@@ -2508,7 +2508,7 @@ static int _nfs4_proc_remove(struct inod -=20 - static int nfs4_proc_remove(struct inode *dir, struct qstr *name) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dir), -@@ -2582,7 +2582,7 @@ static int _nfs4_proc_rename(struct inod - static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_nam= e, - struct inode *new_dir, struct qstr *new_name) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(old_dir), -@@ -2629,7 +2629,7 @@ static int _nfs4_proc_link(struct inode=20 -=20 - static int nfs4_proc_link(struct inode *inode, struct inode *dir, struc= t qstr *name) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(inode), -@@ -2721,7 +2721,7 @@ out: - static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, - struct page *page, unsigned int len, struct iattr *sattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dir), -@@ -2752,7 +2752,7 @@ out: - static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, - struct iattr *sattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dir), -@@ -2801,7 +2801,7 @@ static int _nfs4_proc_readdir(struct den - static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cr= ed, - u64 cookie, struct page *page, unsigned int count, in= t plus) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dentry->d_inode), -@@ -2849,7 +2849,7 @@ out: - static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, - struct iattr *sattr, dev_t rdev) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dir), -@@ -2881,7 +2881,7 @@ static int _nfs4_proc_statfs(struct nfs_ -=20 - static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *f= handle, struct nfs_fsstat *fsstat) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2912,7 +2912,7 @@ static int _nfs4_do_fsinfo(struct nfs_se -=20 - static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fha= ndle, struct nfs_fsinfo *fsinfo) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -2958,7 +2958,7 @@ static int _nfs4_proc_pathconf(struct nf - static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh = *fhandle, - struct nfs_pathconf *pathconf) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -3257,7 +3257,7 @@ out_free: -=20 - static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, si= ze_t buflen) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - ssize_t ret; - do { - ret =3D __nfs4_get_acl_uncached(inode, buf, buflen); -@@ -3313,7 +3313,7 @@ static int __nfs4_proc_set_acl(struct in -=20 - static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size= _t buflen) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(inode), -@@ -3578,7 +3578,7 @@ out: - int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, c= onst nfs4_stateid *stateid, int issync) - { - struct nfs_server *server =3D NFS_SERVER(inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D _nfs4_proc_delegreturn(inode, cred, stateid, issync); -@@ -3651,7 +3651,7 @@ out: -=20 - static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct fi= le_lock *request) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -4044,7 +4044,7 @@ static int _nfs4_do_setlk(struct nfs4_st - static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock= *request) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -4062,7 +4062,7 @@ static int nfs4_lock_reclaim(struct nfs4 - static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock= *request) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - err =3D nfs4_set_lock_state(state, request); -@@ -4120,7 +4120,7 @@ out: -=20 - static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct fi= le_lock *request) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -4180,7 +4180,7 @@ nfs4_proc_lock(struct file *filp, int cm - int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_l= ock *fl) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - err =3D nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.32.38/fs/nfsd/lockd.c linux-2.6.32.38/fs/nfsd/lockd= .c ---- linux-2.6.32.38/fs/nfsd/lockd.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/fs/nfsd/lockd.c 2011-04-17 17:03:15.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/nfsd/lockd.c linux-2.6.32.39/fs/nfsd/lockd= .c +--- linux-2.6.32.39/fs/nfsd/lockd.c 2011-04-17 17:00:52.000000000 -0400 ++++ linux-2.6.32.39/fs/nfsd/lockd.c 2011-04-17 17:03:15.000000000 -0400 @@ -66,7 +66,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -35790,9 +34012,9 @@ diff -urNp linux-2.6.32.38/fs/nfsd/lockd.c linux-= 2.6.32.38/fs/nfsd/lockd.c .fopen =3D nlm_fopen, /* open file for locking */ .fclose =3D nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.32.38/fs/nfsd/vfs.c linux-2.6.32.38/fs/nfsd/vfs.c ---- linux-2.6.32.38/fs/nfsd/vfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/nfsd/vfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/nfsd/vfs.c linux-2.6.32.39/fs/nfsd/vfs.c +--- linux-2.6.32.39/fs/nfsd/vfs.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/nfsd/vfs.c 2011-04-17 15:56:46.000000000 -0400 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs =3D get_fs(); @@ -35820,21 +34042,9 @@ diff -urNp linux-2.6.32.38/fs/nfsd/vfs.c linux-2= .6.32.38/fs/nfsd/vfs.c set_fs(oldfs); =20 if (host_err < 0) -diff -urNp linux-2.6.32.38/fs/nls/nls_base.c linux-2.6.32.38/fs/nls/nls_= base.c ---- linux-2.6.32.38/fs/nls/nls_base.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/nls/nls_base.c 2011-04-17 15:56:46.000000000 -040= 0 -@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl - {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequen= ce */}, - {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequen= ce */}, - {0xFE, 0xFC, 5*6, 0x7FFFFFFF, 0x4000000, /* 6 byte sequen= ce */}, -- {0, /* end of table */} -+ {0, 0, 0, 0, 0, /* end of table */} - }; -=20 - #define UNICODE_MAX 0x0010ffff -diff -urNp linux-2.6.32.38/fs/notify/dnotify/dnotify.c linux-2.6.32.38/f= s/notify/dnotify/dnotify.c ---- linux-2.6.32.38/fs/notify/dnotify/dnotify.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/fs/notify/dnotify/dnotify.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/fs/notify/dnotify/dnotify.c linux-2.6.32.39/f= s/notify/dnotify/dnotify.c +--- linux-2.6.32.39/fs/notify/dnotify/dnotify.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/fs/notify/dnotify/dnotify.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsn kmem_cache_free(dnotify_mark_entry_cache, dnentry); } @@ -35844,9 +34054,9 @@ diff -urNp linux-2.6.32.38/fs/notify/dnotify/dnot= ify.c linux-2.6.32.38/fs/notify .handle_event =3D dnotify_handle_event, .should_send_event =3D dnotify_should_send_event, .free_group_priv =3D NULL, -diff -urNp linux-2.6.32.38/fs/ntfs/dir.c linux-2.6.32.38/fs/ntfs/dir.c ---- linux-2.6.32.38/fs/ntfs/dir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ntfs/dir.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ntfs/dir.c linux-2.6.32.39/fs/ntfs/dir.c +--- linux-2.6.32.39/fs/ntfs/dir.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ntfs/dir.c 2011-04-17 15:56:46.000000000 -0400 @@ -1328,7 +1328,7 @@ find_next_index_buffer: ia =3D (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & ~(s64)(ndir->itype.index.block_size - 1))); @@ -35856,9 +34066,9 @@ diff -urNp linux-2.6.32.38/fs/ntfs/dir.c linux-2.= 6.32.38/fs/ntfs/dir.c ntfs_error(sb, "Out of bounds check failed. Corrupt directory " "inode 0x%lx or driver bug.", vdir->i_ino); goto err_out; -diff -urNp linux-2.6.32.38/fs/ntfs/file.c linux-2.6.32.38/fs/ntfs/file.c ---- linux-2.6.32.38/fs/ntfs/file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ntfs/file.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ntfs/file.c linux-2.6.32.39/fs/ntfs/file.c +--- linux-2.6.32.39/fs/ntfs/file.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ntfs/file.c 2011-04-17 15:56:46.000000000 -0400 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -35868,9 +34078,9 @@ diff -urNp linux-2.6.32.38/fs/ntfs/file.c linux-2= .6.32.38/fs/ntfs/file.c =20 -const struct inode_operations ntfs_empty_inode_ops =3D {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.32.38/fs/ocfs2/cluster/masklog.c linux-2.6.32.38/fs= /ocfs2/cluster/masklog.c ---- linux-2.6.32.38/fs/ocfs2/cluster/masklog.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/fs/ocfs2/cluster/masklog.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/fs/ocfs2/cluster/masklog.c linux-2.6.32.39/fs= /ocfs2/cluster/masklog.c +--- linux-2.6.32.39/fs/ocfs2/cluster/masklog.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/fs/ocfs2/cluster/masklog.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -35880,9 +34090,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/cluster/maskl= og.c linux-2.6.32.38/fs/ocfs2/c .show =3D mlog_show, .store =3D mlog_store, }; -diff -urNp linux-2.6.32.38/fs/ocfs2/localalloc.c linux-2.6.32.38/fs/ocfs= 2/localalloc.c ---- linux-2.6.32.38/fs/ocfs2/localalloc.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/fs/ocfs2/localalloc.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/fs/ocfs2/localalloc.c linux-2.6.32.39/fs/ocfs= 2/localalloc.c +--- linux-2.6.32.39/fs/ocfs2/localalloc.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/fs/ocfs2/localalloc.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -35892,9 +34102,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/localalloc.c = linux-2.6.32.38/fs/ocfs2/locala =20 status =3D 0; bail: -diff -urNp linux-2.6.32.38/fs/ocfs2/ocfs2.h linux-2.6.32.38/fs/ocfs2/ocf= s2.h ---- linux-2.6.32.38/fs/ocfs2/ocfs2.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ocfs2/ocfs2.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ocfs2/ocfs2.h linux-2.6.32.39/fs/ocfs2/ocf= s2.h +--- linux-2.6.32.39/fs/ocfs2/ocfs2.h 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ocfs2/ocfs2.h 2011-04-17 15:56:46.000000000 -0400 @@ -217,11 +217,11 @@ enum ocfs2_vol_state =20 struct ocfs2_alloc_stats @@ -35912,9 +34122,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/ocfs2.h linux= -2.6.32.38/fs/ocfs2/ocfs2.h }; =20 enum ocfs2_local_alloc_state -diff -urNp linux-2.6.32.38/fs/ocfs2/suballoc.c linux-2.6.32.38/fs/ocfs2/= suballoc.c ---- linux-2.6.32.38/fs/ocfs2/suballoc.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/fs/ocfs2/suballoc.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/fs/ocfs2/suballoc.c linux-2.6.32.39/fs/ocfs2/= suballoc.c +--- linux-2.6.32.39/fs/ocfs2/suballoc.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/fs/ocfs2/suballoc.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -35960,9 +34170,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/suballoc.c li= nux-2.6.32.38/fs/ocfs2/suballoc } } if (status < 0) { -diff -urNp linux-2.6.32.38/fs/ocfs2/super.c linux-2.6.32.38/fs/ocfs2/sup= er.c ---- linux-2.6.32.38/fs/ocfs2/super.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/ocfs2/super.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/ocfs2/super.c linux-2.6.32.39/fs/ocfs2/sup= er.c +--- linux-2.6.32.39/fs/ocfs2/super.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/ocfs2/super.c 2011-04-17 15:56:46.000000000 -0400 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s =3D> GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -35997,9 +34207,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/super.c linux= -2.6.32.38/fs/ocfs2/super.c =20 /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats =3D *stats; -diff -urNp linux-2.6.32.38/fs/open.c linux-2.6.32.38/fs/open.c ---- linux-2.6.32.38/fs/open.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/open.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/open.c linux-2.6.32.39/fs/open.c +--- linux-2.6.32.39/fs/open.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/open.c 2011-04-17 15:56:46.000000000 -0400 @@ -275,6 +275,10 @@ static long do_sys_truncate(const char _ error =3D locks_verify_truncate(inode, NULL, length); if (!error) @@ -36184,9 +34394,9 @@ diff -urNp linux-2.6.32.38/fs/open.c linux-2.6.32= .38/fs/open.c if (IS_ERR(f)) { put_unused_fd(fd); fd =3D PTR_ERR(f); -diff -urNp linux-2.6.32.38/fs/partitions/ldm.c linux-2.6.32.38/fs/partit= ions/ldm.c ---- linux-2.6.32.38/fs/partitions/ldm.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/fs/partitions/ldm.c 2011-04-18 19:31:12.000000000 -0= 400 +diff -urNp linux-2.6.32.39/fs/partitions/ldm.c linux-2.6.32.39/fs/partit= ions/ldm.c +--- linux-2.6.32.39/fs/partitions/ldm.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/fs/partitions/ldm.c 2011-04-18 19:31:12.000000000 -0= 400 @@ -1299,6 +1299,11 @@ static bool ldm_frag_add (const u8 *data =20 BUG_ON (!data || !frags); @@ -36233,9 +34443,9 @@ diff -urNp linux-2.6.32.38/fs/partitions/ldm.c li= nux-2.6.32.38/fs/partitions/ldm memcpy (f->data+rec*(size-VBLK_SIZE_HEAD)+VBLK_SIZE_HEAD, data, size); =20 return true; -diff -urNp linux-2.6.32.38/fs/partitions/mac.c linux-2.6.32.38/fs/partit= ions/mac.c ---- linux-2.6.32.38/fs/partitions/mac.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/fs/partitions/mac.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/fs/partitions/mac.c linux-2.6.32.39/fs/partit= ions/mac.c +--- linux-2.6.32.39/fs/partitions/mac.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/fs/partitions/mac.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio return 0; /* not a MacOS disk */ } @@ -36249,18 +34459,9 @@ diff -urNp linux-2.6.32.38/fs/partitions/mac.c l= inux-2.6.32.38/fs/partitions/mac for (slot =3D 1; slot <=3D blocks_in_map; ++slot) { int pos =3D slot * secsize; put_dev_sector(sect); -diff -urNp linux-2.6.32.38/fs/pipe.c linux-2.6.32.38/fs/pipe.c ---- linux-2.6.32.38/fs/pipe.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/pipe.c 2011-04-17 15:56:46.000000000 -0400 -@@ -363,7 +363,7 @@ pipe_read(struct kiocb *iocb, const stru - error =3D ops->confirm(pipe, buf); - if (error) { - if (!ret) -- ret =3D error; -+ error =3D ret; - break; - } -=20 +diff -urNp linux-2.6.32.39/fs/pipe.c linux-2.6.32.39/fs/pipe.c +--- linux-2.6.32.39/fs/pipe.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/pipe.c 2011-04-23 13:37:17.000000000 -0400 @@ -401,9 +401,9 @@ redo: } if (bufs) /* More to do? */ @@ -36384,9 +34585,9 @@ diff -urNp linux-2.6.32.38/fs/pipe.c linux-2.6.32= .38/fs/pipe.c inode->i_fop =3D &rdwr_pipefifo_fops; =20 /* -diff -urNp linux-2.6.32.38/fs/proc/array.c linux-2.6.32.38/fs/proc/array= .c ---- linux-2.6.32.38/fs/proc/array.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/proc/array.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/proc/array.c linux-2.6.32.39/fs/proc/array= .c +--- linux-2.6.32.39/fs/proc/array.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/proc/array.c 2011-04-20 18:18:31.000000000 -0400 @@ -60,6 +60,7 @@ #include #include @@ -36478,7 +34679,7 @@ diff -urNp linux-2.6.32.38/fs/proc/array.c linux-= 2.6.32.38/fs/proc/array.c esp, eip, /* The signal information here is obsolete. -@@ -528,3 +578,10 @@ int proc_pid_statm(struct seq_file *m, s +@@ -528,3 +578,18 @@ int proc_pid_statm(struct seq_file *m, s =20 return 0; } @@ -36486,12 +34687,20 @@ diff -urNp linux-2.6.32.38/fs/proc/array.c linu= x-2.6.32.38/fs/proc/array.c +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR +int proc_pid_ipaddr(struct task_struct *task, char *buffer) +{ -+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); ++ u32 curr_ip =3D 0; ++ unsigned long flags; ++ ++ if (lock_task_sighand(task, &flags)) { ++ curr_ip =3D task->signal->curr_ip; ++ unlock_task_sighand(task, &flags); ++ } ++ ++ return sprintf(buffer, "%pI4\n", &curr_ip); +} +#endif -diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2.6.32.38/fs/proc/base.c ---- linux-2.6.32.38/fs/proc/base.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/proc/base.c 2011-04-18 19:27:44.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/proc/base.c linux-2.6.32.39/fs/proc/base.c +--- linux-2.6.32.39/fs/proc/base.c 2011-04-22 19:16:29.000000000 -0400 ++++ linux-2.6.32.39/fs/proc/base.c 2011-04-22 19:16:44.000000000 -0400 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -36854,14 +35063,10 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux= -2.6.32.38/fs/proc/base.c put_task_struct(task); out: return result; -@@ -2806,11 +2929,21 @@ static int proc_pid_fill_cache(struct fi - /* for the /proc/ directory itself, after non-process stuff has been do= ne */ - int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filld= ir) - { -- unsigned int nr =3D filp->f_pos - FIRST_PROCESS_ENTRY; -- struct task_struct *reaper =3D get_proc_task(filp->f_path.dentry->d_in= ode); -+ unsigned int nr; -+ struct task_struct *reaper; +@@ -2808,6 +2931,11 @@ int proc_pid_readdir(struct file * filp, + { + unsigned int nr; + struct task_struct *reaper; +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PRO= C_USERGROUP) + const struct cred *tmpcred =3D current_cred(); + const struct cred *itercred; @@ -36870,15 +35075,7 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-= 2.6.32.38/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; =20 -+ if (filp->f_pos >=3D PID_MAX_LIMIT + TGID_OFFSET) -+ goto out_no_task; -+ nr =3D filp->f_pos - FIRST_PROCESS_ENTRY; -+ -+ reaper =3D get_proc_task(filp->f_path.dentry->d_inode); - if (!reaper) - goto out_no_task; -=20 -@@ -2826,8 +2959,27 @@ int proc_pid_readdir(struct file * filp, +@@ -2831,8 +2959,27 @@ int proc_pid_readdir(struct file * filp, for (iter =3D next_tgid(ns, iter); iter.task; iter.tgid +=3D 1, iter =3D next_tgid(ns, iter)) { @@ -36907,7 +35104,7 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2= .6.32.38/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -2853,7 +3005,7 @@ static const struct pid_entry tid_base_s +@@ -2858,7 +3005,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -36916,7 +35113,7 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2= .6.32.38/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2877,10 +3029,10 @@ static const struct pid_entry tid_base_s +@@ -2882,10 +3029,10 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc= _attr_dir_operations), #endif @@ -36929,9 +35126,9 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2= .6.32.38/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.32.38/fs/proc/cmdline.c linux-2.6.32.38/fs/proc/cmd= line.c ---- linux-2.6.32.38/fs/proc/cmdline.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/proc/cmdline.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/fs/proc/cmdline.c linux-2.6.32.39/fs/proc/cmd= line.c +--- linux-2.6.32.39/fs/proc/cmdline.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/fs/proc/cmdline.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -23,7 +23,11 @@ static const struct file_operations cmdl =20 static int __init proc_cmdline_init(void) @@ -36944,9 +35141,9 @@ diff -urNp linux-2.6.32.38/fs/proc/cmdline.c linu= x-2.6.32.38/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.32.38/fs/proc/devices.c linux-2.6.32.38/fs/proc/dev= ices.c ---- linux-2.6.32.38/fs/proc/devices.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/proc/devices.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/fs/proc/devices.c linux-2.6.32.39/fs/proc/dev= ices.c +--- linux-2.6.32.39/fs/proc/devices.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/fs/proc/devices.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -64,7 +64,11 @@ static const struct file_operations proc =20 static int __init proc_devices_init(void) @@ -36959,9 +35156,9 @@ diff -urNp linux-2.6.32.38/fs/proc/devices.c linu= x-2.6.32.38/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.32.38/fs/proc/inode.c linux-2.6.32.38/fs/proc/inode= .c ---- linux-2.6.32.38/fs/proc/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/proc/inode.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/proc/inode.c linux-2.6.32.39/fs/proc/inode= .c +--- linux-2.6.32.39/fs/proc/inode.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/proc/inode.c 2011-04-17 15:56:46.000000000 -0400 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode =3D de->mode; @@ -36974,9 +35171,9 @@ diff -urNp linux-2.6.32.38/fs/proc/inode.c linux-= 2.6.32.38/fs/proc/inode.c } if (de->size) inode->i_size =3D de->size; -diff -urNp linux-2.6.32.38/fs/proc/internal.h linux-2.6.32.38/fs/proc/in= ternal.h ---- linux-2.6.32.38/fs/proc/internal.h 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/proc/internal.h 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/fs/proc/internal.h linux-2.6.32.39/fs/proc/in= ternal.h +--- linux-2.6.32.39/fs/proc/internal.h 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/fs/proc/internal.h 2011-04-17 15:56:46.000000000 -04= 00 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task); extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, @@ -36987,9 +35184,9 @@ diff -urNp linux-2.6.32.38/fs/proc/internal.h lin= ux-2.6.32.38/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); =20 extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.32.38/fs/proc/Kconfig linux-2.6.32.38/fs/proc/Kconf= ig ---- linux-2.6.32.38/fs/proc/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/proc/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/proc/Kconfig linux-2.6.32.39/fs/proc/Kconf= ig +--- linux-2.6.32.39/fs/proc/Kconfig 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/proc/Kconfig 2011-04-17 15:56:46.000000000 -0400 @@ -30,12 +30,12 @@ config PROC_FS =20 config PROC_KCORE @@ -37017,9 +35214,9 @@ diff -urNp linux-2.6.32.38/fs/proc/Kconfig linux-= 2.6.32.38/fs/proc/Kconfig bool "Enable /proc page monitoring" if EMBEDDED help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.32.38/fs/proc/kcore.c linux-2.6.32.38/fs/proc/kcore= .c ---- linux-2.6.32.38/fs/proc/kcore.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/proc/kcore.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/proc/kcore.c linux-2.6.32.39/fs/proc/kcore= .c +--- linux-2.6.32.39/fs/proc/kcore.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/proc/kcore.c 2011-04-17 15:56:46.000000000 -0400 @@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use * the addresses in the elf_phdr on our list. */ @@ -37078,9 +35275,9 @@ diff -urNp linux-2.6.32.38/fs/proc/kcore.c linux-= 2.6.32.38/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.32.38/fs/proc/meminfo.c linux-2.6.32.38/fs/proc/mem= info.c ---- linux-2.6.32.38/fs/proc/meminfo.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/proc/meminfo.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/fs/proc/meminfo.c linux-2.6.32.39/fs/proc/mem= info.c +--- linux-2.6.32.39/fs/proc/meminfo.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/fs/proc/meminfo.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ vmi.used >> 10, vmi.largest_chunk >> 10 @@ -37090,9 +35287,9 @@ diff -urNp linux-2.6.32.38/fs/proc/meminfo.c linu= x-2.6.32.38/fs/proc/meminfo.c #endif ); =20 -diff -urNp linux-2.6.32.38/fs/proc/nommu.c linux-2.6.32.38/fs/proc/nommu= .c ---- linux-2.6.32.38/fs/proc/nommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/proc/nommu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/proc/nommu.c linux-2.6.32.39/fs/proc/nommu= .c +--- linux-2.6.32.39/fs/proc/nommu.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/proc/nommu.c 2011-04-17 15:56:46.000000000 -0400 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len =3D 1; @@ -37102,9 +35299,9 @@ diff -urNp linux-2.6.32.38/fs/proc/nommu.c linux-= 2.6.32.38/fs/proc/nommu.c } =20 seq_putc(m, '\n'); -diff -urNp linux-2.6.32.38/fs/proc/proc_net.c linux-2.6.32.38/fs/proc/pr= oc_net.c ---- linux-2.6.32.38/fs/proc/proc_net.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/proc/proc_net.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/fs/proc/proc_net.c linux-2.6.32.39/fs/proc/pr= oc_net.c +--- linux-2.6.32.39/fs/proc/proc_net.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/fs/proc/proc_net.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -37123,9 +35320,9 @@ diff -urNp linux-2.6.32.38/fs/proc/proc_net.c lin= ux-2.6.32.38/fs/proc/proc_net.c =20 rcu_read_lock(); task =3D pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.32.38/fs/proc/proc_sysctl.c linux-2.6.32.38/fs/proc= /proc_sysctl.c ---- linux-2.6.32.38/fs/proc/proc_sysctl.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/fs/proc/proc_sysctl.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/fs/proc/proc_sysctl.c linux-2.6.32.39/fs/proc= /proc_sysctl.c +--- linux-2.6.32.39/fs/proc/proc_sysctl.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/fs/proc/proc_sysctl.c 2011-04-17 15:56:46.000000000 = -0400 @@ -7,6 +7,8 @@ #include #include "internal.h" @@ -37165,9 +35362,9 @@ diff -urNp linux-2.6.32.38/fs/proc/proc_sysctl.c = linux-2.6.32.38/fs/proc/proc_sy generic_fillattr(inode, stat); if (table) stat->mode =3D (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.32.38/fs/proc/root.c linux-2.6.32.38/fs/proc/root.c ---- linux-2.6.32.38/fs/proc/root.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/proc/root.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/proc/root.c linux-2.6.32.39/fs/proc/root.c +--- linux-2.6.32.39/fs/proc/root.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/proc/root.c 2011-04-17 15:56:46.000000000 -0400 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -37184,9 +35381,9 @@ diff -urNp linux-2.6.32.38/fs/proc/root.c linux-2= .6.32.38/fs/proc/root.c proc_sys_init(); } =20 -diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c linux-2.6.32.38/fs/proc/ta= sk_mmu.c ---- linux-2.6.32.38/fs/proc/task_mmu.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/proc/task_mmu.c 2011-04-18 19:36:12.000000000 -04= 00 +diff -urNp linux-2.6.32.39/fs/proc/task_mmu.c linux-2.6.32.39/fs/proc/ta= sk_mmu.c +--- linux-2.6.32.39/fs/proc/task_mmu.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/fs/proc/task_mmu.c 2011-04-23 13:38:09.000000000 -04= 00 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -37279,7 +35476,7 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c lin= ux-2.6.32.38/fs/proc/task_mmu.c MAJOR(dev), MINOR(dev), ino, &len); =20 /* -@@ -239,16 +259,16 @@ static void show_map_vma(struct seq_file +@@ -239,7 +259,7 @@ static void show_map_vma(struct seq_file */ if (file) { pad_len_spaces(m, len); @@ -37288,10 +35485,9 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c li= nux-2.6.32.38/fs/proc/task_mmu.c } else { const char *name =3D arch_vma_name(vma); if (!name) { - if (mm) { -- if (vma->vm_start <=3D mm->brk && -- vma->vm_end >=3D mm->start_brk) { -+ if (vma->vm_start <=3D mm->brk && vma->vm_end >=3D mm->start_brk) { +@@ -247,8 +267,9 @@ static void show_map_vma(struct seq_file + if (vma->vm_start <=3D mm->brk && + vma->vm_end >=3D mm->start_brk) { name =3D "[heap]"; - } else if (vma->vm_start <=3D mm->start_stack && - vma->vm_end >=3D mm->start_stack) { @@ -37301,7 +35497,7 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c lin= ux-2.6.32.38/fs/proc/task_mmu.c name =3D "[stack]"; } } else { -@@ -391,9 +411,16 @@ static int show_smap(struct seq_file *m, +@@ -391,9 +412,16 @@ static int show_smap(struct seq_file *m, }; =20 memset(&mss, 0, sizeof mss); @@ -37321,7 +35517,7 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c lin= ux-2.6.32.38/fs/proc/task_mmu.c =20 show_map_vma(m, vma); =20 -@@ -409,7 +436,11 @@ static int show_smap(struct seq_file *m, +@@ -409,7 +437,11 @@ static int show_smap(struct seq_file *m, "Swap: %8lu kB\n" "KernelPageSize: %8lu kB\n" "MMUPageSize: %8lu kB\n", @@ -37333,9 +35529,9 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c lin= ux-2.6.32.38/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.32.38/fs/proc/task_nommu.c linux-2.6.32.38/fs/proc/= task_nommu.c ---- linux-2.6.32.38/fs/proc/task_nommu.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/fs/proc/task_nommu.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/fs/proc/task_nommu.c linux-2.6.32.39/fs/proc/= task_nommu.c +--- linux-2.6.32.39/fs/proc/task_nommu.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/fs/proc/task_nommu.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes +=3D kobjsize(mm); @@ -37354,9 +35550,9 @@ diff -urNp linux-2.6.32.38/fs/proc/task_nommu.c l= inux-2.6.32.38/fs/proc/task_nom } =20 seq_putc(m, '\n'); -diff -urNp linux-2.6.32.38/fs/readdir.c linux-2.6.32.38/fs/readdir.c ---- linux-2.6.32.38/fs/readdir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/readdir.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/readdir.c linux-2.6.32.39/fs/readdir.c +--- linux-2.6.32.39/fs/readdir.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/readdir.c 2011-04-17 15:56:46.000000000 -0400 @@ -16,6 +16,7 @@ #include #include @@ -37446,9 +35642,9 @@ diff -urNp linux-2.6.32.38/fs/readdir.c linux-2.6= .32.38/fs/readdir.c buf.count =3D count; buf.error =3D 0; =20 -diff -urNp linux-2.6.32.38/fs/reiserfs/do_balan.c linux-2.6.32.38/fs/rei= serfs/do_balan.c ---- linux-2.6.32.38/fs/reiserfs/do_balan.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/fs/reiserfs/do_balan.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/fs/reiserfs/do_balan.c linux-2.6.32.39/fs/rei= serfs/do_balan.c +--- linux-2.6.32.39/fs/reiserfs/do_balan.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/fs/reiserfs/do_balan.c 2011-04-17 15:56:46.000000000= -0400 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -37458,9 +35654,9 @@ diff -urNp linux-2.6.32.38/fs/reiserfs/do_balan.c= linux-2.6.32.38/fs/reiserfs/do do_balance_starts(tb); =20 /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.32.38/fs/reiserfs/item_ops.c linux-2.6.32.38/fs/rei= serfs/item_ops.c ---- linux-2.6.32.38/fs/reiserfs/item_ops.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/fs/reiserfs/item_ops.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/fs/reiserfs/item_ops.c linux-2.6.32.39/fs/rei= serfs/item_ops.c +--- linux-2.6.32.39/fs/reiserfs/item_ops.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/fs/reiserfs/item_ops.c 2011-04-17 15:56:46.000000000= -0400 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -37515,9 +35711,9 @@ diff -urNp linux-2.6.32.38/fs/reiserfs/item_ops.c= linux-2.6.32.38/fs/reiserfs/it &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.32.38/fs/reiserfs/procfs.c linux-2.6.32.38/fs/reise= rfs/procfs.c ---- linux-2.6.32.38/fs/reiserfs/procfs.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/fs/reiserfs/procfs.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/fs/reiserfs/procfs.c linux-2.6.32.39/fs/reise= rfs/procfs.c +--- linux-2.6.32.39/fs/reiserfs/procfs.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/fs/reiserfs/procfs.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -37527,9 +35723,9 @@ diff -urNp linux-2.6.32.38/fs/reiserfs/procfs.c l= inux-2.6.32.38/fs/reiserfs/proc SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), -diff -urNp linux-2.6.32.38/fs/select.c linux-2.6.32.38/fs/select.c ---- linux-2.6.32.38/fs/select.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/select.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/select.c linux-2.6.32.39/fs/select.c +--- linux-2.6.32.39/fs/select.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/select.c 2011-04-17 15:56:46.000000000 -0400 @@ -20,6 +20,7 @@ #include #include @@ -37546,9 +35742,9 @@ diff -urNp linux-2.6.32.38/fs/select.c linux-2.6.= 32.38/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; =20 -diff -urNp linux-2.6.32.38/fs/seq_file.c linux-2.6.32.38/fs/seq_file.c ---- linux-2.6.32.38/fs/seq_file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/seq_file.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/seq_file.c linux-2.6.32.39/fs/seq_file.c +--- linux-2.6.32.39/fs/seq_file.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/seq_file.c 2011-04-17 15:56:46.000000000 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,=20 return 0; } @@ -37589,9 +35785,9 @@ diff -urNp linux-2.6.32.38/fs/seq_file.c linux-2.= 6.32.38/fs/seq_file.c if (!m->buf) goto Enomem; m->count =3D 0; -diff -urNp linux-2.6.32.38/fs/smbfs/symlink.c linux-2.6.32.38/fs/smbfs/s= ymlink.c ---- linux-2.6.32.38/fs/smbfs/symlink.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/smbfs/symlink.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/fs/smbfs/symlink.c linux-2.6.32.39/fs/smbfs/s= ymlink.c +--- linux-2.6.32.39/fs/smbfs/symlink.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/fs/smbfs/symlink.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent =20 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, v= oid *p) @@ -37601,9 +35797,9 @@ diff -urNp linux-2.6.32.38/fs/smbfs/symlink.c lin= ux-2.6.32.38/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.32.38/fs/splice.c linux-2.6.32.38/fs/splice.c ---- linux-2.6.32.38/fs/splice.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/splice.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c +--- linux-2.6.32.39/fs/splice.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/splice.c 2011-04-17 15:56:46.000000000 -0400 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); =20 @@ -37742,9 +35938,9 @@ diff -urNp linux-2.6.32.38/fs/splice.c linux-2.6.= 32.38/fs/splice.c ret =3D -EAGAIN; =20 pipe_unlock(ipipe); -diff -urNp linux-2.6.32.38/fs/sysfs/file.c linux-2.6.32.38/fs/sysfs/file= .c ---- linux-2.6.32.38/fs/sysfs/file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/sysfs/file.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/sysfs/file.c linux-2.6.32.39/fs/sysfs/file= .c +--- linux-2.6.32.39/fs/sysfs/file.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/sysfs/file.c 2011-04-17 15:56:46.000000000 -0400 @@ -53,7 +53,7 @@ struct sysfs_buffer { size_t count; loff_t pos; @@ -37781,9 +35977,9 @@ diff -urNp linux-2.6.32.38/fs/sysfs/file.c linux-= 2.6.32.38/fs/sysfs/file.c int error =3D -EACCES; char *p; =20 -diff -urNp linux-2.6.32.38/fs/sysfs/mount.c linux-2.6.32.38/fs/sysfs/mou= nt.c ---- linux-2.6.32.38/fs/sysfs/mount.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/sysfs/mount.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/sysfs/mount.c linux-2.6.32.39/fs/sysfs/mou= nt.c +--- linux-2.6.32.39/fs/sysfs/mount.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/sysfs/mount.c 2011-04-17 15:56:46.000000000 -0400 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root =3D { .s_name =3D "", .s_count =3D ATOMIC_INIT(1), @@ -37796,9 +35992,9 @@ diff -urNp linux-2.6.32.38/fs/sysfs/mount.c linux= -2.6.32.38/fs/sysfs/mount.c .s_ino =3D 1, }; =20 -diff -urNp linux-2.6.32.38/fs/sysfs/symlink.c linux-2.6.32.38/fs/sysfs/s= ymlink.c ---- linux-2.6.32.38/fs/sysfs/symlink.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/fs/sysfs/symlink.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/fs/sysfs/symlink.c linux-2.6.32.39/fs/sysfs/s= ymlink.c +--- linux-2.6.32.39/fs/sysfs/symlink.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/fs/sysfs/symlink.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de =20 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd,= void *cookie) @@ -37808,35 +36004,9 @@ diff -urNp linux-2.6.32.38/fs/sysfs/symlink.c li= nux-2.6.32.38/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.32.38/fs/ubifs/debug.c linux-2.6.32.38/fs/ubifs/deb= ug.c ---- linux-2.6.32.38/fs/ubifs/debug.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/fs/ubifs/debug.c 2011-04-17 17:03:15.000000000 -0400 -@@ -2691,19 +2691,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf - } -=20 - fname =3D "dump_lprops"; -- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; -+ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; - if (IS_ERR(dent)) - goto out_remove; - d->dfs_dump_lprops =3D dent; -=20 - fname =3D "dump_budg"; -- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; -+ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; - if (IS_ERR(dent)) - goto out_remove; - d->dfs_dump_budg =3D dent; -=20 - fname =3D "dump_tnc"; -- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; -+ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; - if (IS_ERR(dent)) - goto out_remove; - d->dfs_dump_tnc =3D dent; -diff -urNp linux-2.6.32.38/fs/udf/balloc.c linux-2.6.32.38/fs/udf/balloc= .c ---- linux-2.6.32.38/fs/udf/balloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/udf/balloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/udf/balloc.c linux-2.6.32.39/fs/udf/balloc= .c +--- linux-2.6.32.39/fs/udf/balloc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/udf/balloc.c 2011-04-17 15:56:46.000000000 -0400 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc =20 mutex_lock(&sbi->s_alloc_mutex); @@ -37859,20 +36029,9 @@ diff -urNp linux-2.6.32.38/fs/udf/balloc.c linux= -2.6.32.38/fs/udf/balloc.c udf_debug("%d < %d || %d + %d > %d\n", bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, partmap->s_partition_len); -diff -urNp linux-2.6.32.38/fs/udf/misc.c linux-2.6.32.38/fs/udf/misc.c ---- linux-2.6.32.38/fs/udf/misc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/udf/misc.c 2011-04-17 15:56:46.000000000 -0400 -@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat - iinfo->i_lenEAttr +=3D size; - return (struct genericFormat *)&ea[offset]; - } -- if (loc & 0x02) -- ; -+ if (loc & 0x02) { -+ } -=20 - return NULL; - } +diff -urNp linux-2.6.32.39/fs/udf/misc.c linux-2.6.32.39/fs/udf/misc.c +--- linux-2.6.32.39/fs/udf/misc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/udf/misc.c 2011-04-23 12:56:11.000000000 -0400 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id =20 u8 udf_tag_checksum(const struct tag *t) @@ -37882,21 +36041,9 @@ diff -urNp linux-2.6.32.38/fs/udf/misc.c linux-2= .6.32.38/fs/udf/misc.c u8 checksum =3D 0; int i; for (i =3D 0; i < sizeof(struct tag); ++i) -diff -urNp linux-2.6.32.38/fs/udf/udfdecl.h linux-2.6.32.38/fs/udf/udfde= cl.h ---- linux-2.6.32.38/fs/udf/udfdecl.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/udf/udfdecl.h 2011-04-17 15:56:46.000000000 -0400 -@@ -26,7 +26,7 @@ do { \ - printk(f, ##a); \ - } while (0) - #else --#define udf_debug(f, a...) /**/ -+#define udf_debug(f, a...) do {} while (0) - #endif -=20 - #define udf_info(f, a...) \ -diff -urNp linux-2.6.32.38/fs/utimes.c linux-2.6.32.38/fs/utimes.c ---- linux-2.6.32.38/fs/utimes.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/utimes.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/utimes.c linux-2.6.32.39/fs/utimes.c +--- linux-2.6.32.39/fs/utimes.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/utimes.c 2011-04-17 15:56:46.000000000 -0400 @@ -1,6 +1,7 @@ #include #include @@ -37918,9 +36065,9 @@ diff -urNp linux-2.6.32.38/fs/utimes.c linux-2.6.= 32.38/fs/utimes.c mutex_lock(&inode->i_mutex); error =3D notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.32.38/fs/xattr_acl.c linux-2.6.32.38/fs/xattr_acl.c ---- linux-2.6.32.38/fs/xattr_acl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/xattr_acl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/xattr_acl.c linux-2.6.32.39/fs/xattr_acl.c +--- linux-2.6.32.39/fs/xattr_acl.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/xattr_acl.c 2011-04-17 15:56:46.000000000 -0400 @@ -17,8 +17,8 @@ struct posix_acl * posix_acl_from_xattr(const void *value, size_t size) @@ -37932,9 +36079,9 @@ diff -urNp linux-2.6.32.38/fs/xattr_acl.c linux-2= .6.32.38/fs/xattr_acl.c int count; struct posix_acl *acl; struct posix_acl_entry *acl_e; -diff -urNp linux-2.6.32.38/fs/xattr.c linux-2.6.32.38/fs/xattr.c ---- linux-2.6.32.38/fs/xattr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/fs/xattr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/fs/xattr.c linux-2.6.32.39/fs/xattr.c +--- linux-2.6.32.39/fs/xattr.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/fs/xattr.c 2011-04-17 15:56:46.000000000 -0400 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); * Extended attribute SET operations */ @@ -37997,9 +36144,9 @@ diff -urNp linux-2.6.32.38/fs/xattr.c linux-2.6.3= 2.38/fs/xattr.c mnt_drop_write(f->f_path.mnt); } fput(f); -diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.3= 8/fs/xfs/linux-2.6/xfs_ioctl32.c ---- linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.3= 9/fs/xfs/linux-2.6/xfs_ioctl32.c +--- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1( xfs_fsop_geom_t fsgeo; int error; @@ -38008,9 +36155,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_i= octl32.c linux-2.6.32.38/fs/xfs error =3D xfs_fs_geometry(mp, &fsgeo, 3); if (error) return -error; -diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.38/= fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 17:00:52.000= 000000 -0400 -+++ linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:07:09.000= 000000 -0400 +diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.39/= fs/xfs/linux-2.6/xfs_ioctl.c +--- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 17:00:52.000= 000000 -0400 ++++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:07:09.000= 000000 -0400 @@ -134,7 +134,7 @@ xfs_find_handle( } =20 @@ -38038,9 +36185,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_i= octl.c linux-2.6.32.38/fs/xfs/l int error; =20 error =3D xfs_fs_geometry(mp, &fsgeo, 3); -diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.38/f= s/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.32.38/fs/xfs/linux-2.6/xfs_iops.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.39/f= s/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -38050,9 +36197,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_i= ops.c linux-2.6.32.38/fs/xfs/li =20 if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.32.38/fs/xfs/xfs_bmap.c linux-2.6.32.38/fs/xfs/xfs_= bmap.c ---- linux-2.6.32.38/fs/xfs/xfs_bmap.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/fs/xfs/xfs_bmap.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/fs/xfs/xfs_bmap.c linux-2.6.32.39/fs/xfs/xfs_= bmap.c +--- linux-2.6.32.39/fs/xfs/xfs_bmap.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/fs/xfs/xfs_bmap.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -38062,9 +36209,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/xfs_bmap.c linu= x-2.6.32.38/fs/xfs/xfs_bmap.c #endif /* DEBUG */ =20 #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c linux-2.6.32.38/fs/xfs/x= fs_dir2_sf.c ---- linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:07:30.000000000 -= 0400 +diff -urNp linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c linux-2.6.32.39/fs/xfs/x= fs_dir2_sf.c +--- linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:07:30.000000000 -= 0400 @@ -779,7 +779,15 @@ xfs_dir2_sf_getdents( } =20 @@ -38082,9 +36229,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c l= inux-2.6.32.38/fs/xfs/xfs_dir2_ off & 0x7fffffff, ino, DT_UNKNOWN)) { *offset =3D off & 0x7fffffff; return 0; -diff -urNp linux-2.6.32.38/grsecurity/gracl_alloc.c linux-2.6.32.38/grse= curity/gracl_alloc.c ---- linux-2.6.32.38/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.32.38/grsecurity/gracl_alloc.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/grsecurity/gracl_alloc.c linux-2.6.32.39/grse= curity/gracl_alloc.c +--- linux-2.6.32.39/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.32.39/grsecurity/gracl_alloc.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -0,0 +1,105 @@ +#include +#include @@ -38191,9 +36338,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_alloc= .c linux-2.6.32.38/grsecurity/g + else + return 1; +} -diff -urNp linux-2.6.32.38/grsecurity/gracl.c linux-2.6.32.38/grsecurity= /gracl.c ---- linux-2.6.32.38/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.32.38/grsecurity/gracl.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/grsecurity/gracl.c linux-2.6.32.39/grsecurity= /gracl.c +--- linux-2.6.32.39/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -05= 00 ++++ linux-2.6.32.39/grsecurity/gracl.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -0,0 +1,4050 @@ +#include +#include @@ -42245,9 +40392,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl.c lin= ux-2.6.32.38/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.32.38/grsecurity/gracl_cap.c linux-2.6.32.38/grsecu= rity/gracl_cap.c ---- linux-2.6.32.38/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/grsecurity/gracl_cap.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/grsecurity/gracl_cap.c linux-2.6.32.39/grsecu= rity/gracl_cap.c +--- linux-2.6.32.39/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/grsecurity/gracl_cap.c 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,138 @@ +#include +#include @@ -42387,9 +40534,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_cap.c= linux-2.6.32.38/grsecurity/gra + return 0; +} + -diff -urNp linux-2.6.32.38/grsecurity/gracl_fs.c linux-2.6.32.38/grsecur= ity/gracl_fs.c ---- linux-2.6.32.38/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.32.38/grsecurity/gracl_fs.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/grsecurity/gracl_fs.c linux-2.6.32.39/grsecur= ity/gracl_fs.c +--- linux-2.6.32.39/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.32.39/grsecurity/gracl_fs.c 2011-04-17 15:56:46.000000000 = -0400 @@ -0,0 +1,431 @@ +#include +#include @@ -42822,9 +40969,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_fs.c = linux-2.6.32.38/grsecurity/grac + + return 0; +} -diff -urNp linux-2.6.32.38/grsecurity/gracl_ip.c linux-2.6.32.38/grsecur= ity/gracl_ip.c ---- linux-2.6.32.38/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.32.38/grsecurity/gracl_ip.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/grsecurity/gracl_ip.c linux-2.6.32.39/grsecur= ity/gracl_ip.c +--- linux-2.6.32.39/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.32.39/grsecurity/gracl_ip.c 2011-04-17 15:56:46.000000000 = -0400 @@ -0,0 +1,382 @@ +#include +#include @@ -43208,9 +41355,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_ip.c = linux-2.6.32.38/grsecurity/grac + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin= , SOCK_DGRAM); +} -diff -urNp linux-2.6.32.38/grsecurity/gracl_learn.c linux-2.6.32.38/grse= curity/gracl_learn.c ---- linux-2.6.32.38/grsecurity/gracl_learn.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.32.38/grsecurity/gracl_learn.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/grsecurity/gracl_learn.c linux-2.6.32.39/grse= curity/gracl_learn.c +--- linux-2.6.32.39/grsecurity/gracl_learn.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.32.39/grsecurity/gracl_learn.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -0,0 +1,211 @@ +#include +#include @@ -43423,9 +41570,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_learn= .c linux-2.6.32.38/grsecurity/g + .release =3D close_learn, + .poll =3D poll_learn, +}; -diff -urNp linux-2.6.32.38/grsecurity/gracl_res.c linux-2.6.32.38/grsecu= rity/gracl_res.c ---- linux-2.6.32.38/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/grsecurity/gracl_res.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/grsecurity/gracl_res.c linux-2.6.32.39/grsecu= rity/gracl_res.c +--- linux-2.6.32.39/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/grsecurity/gracl_res.c 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,67 @@ +#include +#include @@ -43494,9 +41641,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_res.c= linux-2.6.32.38/grsecurity/gra + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.32.38/grsecurity/gracl_segv.c linux-2.6.32.38/grsec= urity/gracl_segv.c ---- linux-2.6.32.38/grsecurity/gracl_segv.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/grsecurity/gracl_segv.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/grsecurity/gracl_segv.c linux-2.6.32.39/grsec= urity/gracl_segv.c +--- linux-2.6.32.39/grsecurity/gracl_segv.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/grsecurity/gracl_segv.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,284 @@ +#include +#include @@ -43782,9 +41929,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_segv.= c linux-2.6.32.38/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.38/grsecurity/gracl_shm.c linux-2.6.32.38/grsecu= rity/gracl_shm.c ---- linux-2.6.32.38/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/grsecurity/gracl_shm.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/grsecurity/gracl_shm.c linux-2.6.32.39/grsecu= rity/gracl_shm.c +--- linux-2.6.32.39/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/grsecurity/gracl_shm.c 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,40 @@ +#include +#include @@ -43826,9 +41973,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_shm.c= linux-2.6.32.38/grsecurity/gra + + return 1; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_chdir.c linux-2.6.32.38/grse= curity/grsec_chdir.c ---- linux-2.6.32.38/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_chdir.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_chdir.c linux-2.6.32.39/grse= curity/grsec_chdir.c +--- linux-2.6.32.39/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_chdir.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -0,0 +1,19 @@ +#include +#include @@ -43849,9 +41996,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_chdir= .c linux-2.6.32.38/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_chroot.c linux-2.6.32.38/grs= ecurity/grsec_chroot.c ---- linux-2.6.32.38/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000= 000 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_chroot.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_chroot.c linux-2.6.32.39/grs= ecurity/grsec_chroot.c +--- linux-2.6.32.39/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000= 000 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_chroot.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -0,0 +1,395 @@ +#include +#include @@ -44248,9 +42395,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_chroo= t.c linux-2.6.32.38/grsecurity/ +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.32.38/grsecurity/grsec_disabled.c linux-2.6.32.38/g= rsecurity/grsec_disabled.c ---- linux-2.6.32.38/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.0000= 00000 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_disabled.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_disabled.c linux-2.6.32.39/g= rsecurity/grsec_disabled.c +--- linux-2.6.32.39/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.0000= 00000 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_disabled.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -0,0 +1,447 @@ +#include +#include @@ -44699,9 +42846,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_disab= led.c linux-2.6.32.38/grsecurit +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.32.38/grsecurity/grsec_exec.c linux-2.6.32.38/grsec= urity/grsec_exec.c ---- linux-2.6.32.38/grsecurity/grsec_exec.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_exec.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_exec.c linux-2.6.32.39/grsec= urity/grsec_exec.c +--- linux-2.6.32.39/grsecurity/grsec_exec.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_exec.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,148 @@ +#include +#include @@ -44851,9 +42998,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_exec.= c linux-2.6.32.38/grsecurity/gr + return; +} +#endif -diff -urNp linux-2.6.32.38/grsecurity/grsec_fifo.c linux-2.6.32.38/grsec= urity/grsec_fifo.c ---- linux-2.6.32.38/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_fifo.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_fifo.c linux-2.6.32.39/grsec= urity/grsec_fifo.c +--- linux-2.6.32.39/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_fifo.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,24 @@ +#include +#include @@ -44879,9 +43026,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_fifo.= c linux-2.6.32.38/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_fork.c linux-2.6.32.38/grsec= urity/grsec_fork.c ---- linux-2.6.32.38/grsecurity/grsec_fork.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_fork.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_fork.c linux-2.6.32.39/grsec= urity/grsec_fork.c +--- linux-2.6.32.39/grsecurity/grsec_fork.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_fork.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,23 @@ +#include +#include @@ -44906,9 +43053,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_fork.= c linux-2.6.32.38/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_init.c linux-2.6.32.38/grsec= urity/grsec_init.c ---- linux-2.6.32.38/grsecurity/grsec_init.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_init.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_init.c linux-2.6.32.39/grsec= urity/grsec_init.c +--- linux-2.6.32.39/grsecurity/grsec_init.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_init.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,270 @@ +#include +#include @@ -45180,9 +43327,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_init.= c linux-2.6.32.38/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_link.c linux-2.6.32.38/grsec= urity/grsec_link.c ---- linux-2.6.32.38/grsecurity/grsec_link.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_link.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_link.c linux-2.6.32.39/grsec= urity/grsec_link.c +--- linux-2.6.32.39/grsecurity/grsec_link.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_link.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,43 @@ +#include +#include @@ -45227,9 +43374,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_link.= c linux-2.6.32.38/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_log.c linux-2.6.32.38/grsecu= rity/grsec_log.c ---- linux-2.6.32.38/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/grsecurity/grsec_log.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_log.c linux-2.6.32.39/grsecu= rity/grsec_log.c +--- linux-2.6.32.39/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/grsecurity/grsec_log.c 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,310 @@ +#include +#include @@ -45541,9 +43688,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_log.c= linux-2.6.32.38/grsecurity/grs + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_mem.c linux-2.6.32.38/grsecu= rity/grsec_mem.c ---- linux-2.6.32.38/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/grsecurity/grsec_mem.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_mem.c linux-2.6.32.39/grsecu= rity/grsec_mem.c +--- linux-2.6.32.39/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/grsecurity/grsec_mem.c 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,33 @@ +#include +#include @@ -45578,9 +43725,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_mem.c= linux-2.6.32.38/grsecurity/grs + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_mount.c linux-2.6.32.38/grse= curity/grsec_mount.c ---- linux-2.6.32.38/grsecurity/grsec_mount.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_mount.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_mount.c linux-2.6.32.39/grse= curity/grsec_mount.c +--- linux-2.6.32.39/grsecurity/grsec_mount.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_mount.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -0,0 +1,62 @@ +#include +#include @@ -45644,9 +43791,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_mount= .c linux-2.6.32.38/grsecurity/g +#endif + return 0; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_pax.c linux-2.6.32.38/grsecu= rity/grsec_pax.c ---- linux-2.6.32.38/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/grsecurity/grsec_pax.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_pax.c linux-2.6.32.39/grsecu= rity/grsec_pax.c +--- linux-2.6.32.39/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/grsecurity/grsec_pax.c 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,36 @@ +#include +#include @@ -45684,9 +43831,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_pax.c= linux-2.6.32.38/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_ptrace.c linux-2.6.32.38/grs= ecurity/grsec_ptrace.c ---- linux-2.6.32.38/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000= 000 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_ptrace.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_ptrace.c linux-2.6.32.39/grs= ecurity/grsec_ptrace.c +--- linux-2.6.32.39/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000= 000 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_ptrace.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -0,0 +1,14 @@ +#include +#include @@ -45702,9 +43849,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_ptrac= e.c linux-2.6.32.38/grsecurity/ +#endif + return; +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_sig.c linux-2.6.32.38/grsecu= rity/grsec_sig.c ---- linux-2.6.32.38/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/grsecurity/grsec_sig.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_sig.c linux-2.6.32.39/grsecu= rity/grsec_sig.c +--- linux-2.6.32.39/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/grsecurity/grsec_sig.c 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,196 @@ +#include +#include @@ -45902,9 +44049,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_sig.c= linux-2.6.32.38/grsecurity/grs + return 0; +} + -diff -urNp linux-2.6.32.38/grsecurity/grsec_sock.c linux-2.6.32.38/grsec= urity/grsec_sock.c ---- linux-2.6.32.38/grsecurity/grsec_sock.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_sock.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_sock.c linux-2.6.32.39/grsec= urity/grsec_sock.c +--- linux-2.6.32.39/grsecurity/grsec_sock.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_sock.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,275 @@ +#include +#include @@ -46181,9 +44328,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_sock.= c linux-2.6.32.38/grsecurity/gr + return current_cap(); +#endif +} -diff -urNp linux-2.6.32.38/grsecurity/grsec_sysctl.c linux-2.6.32.38/grs= ecurity/grsec_sysctl.c ---- linux-2.6.32.38/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000= 000 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_sysctl.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_sysctl.c linux-2.6.32.39/grs= ecurity/grsec_sysctl.c +--- linux-2.6.32.39/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000= 000 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_sysctl.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -0,0 +1,479 @@ +#include +#include @@ -46664,9 +44811,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_sysct= l.c linux-2.6.32.38/grsecurity/ + { .ctl_name =3D 0 } +}; +#endif -diff -urNp linux-2.6.32.38/grsecurity/grsec_time.c linux-2.6.32.38/grsec= urity/grsec_time.c ---- linux-2.6.32.38/grsecurity/grsec_time.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/grsecurity/grsec_time.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_time.c linux-2.6.32.39/grsec= urity/grsec_time.c +--- linux-2.6.32.39/grsecurity/grsec_time.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/grsecurity/grsec_time.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,16 @@ +#include +#include @@ -46684,9 +44831,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_time.= c linux-2.6.32.38/grsecurity/gr +} + +EXPORT_SYMBOL(gr_log_timechange); -diff -urNp linux-2.6.32.38/grsecurity/grsec_tpe.c linux-2.6.32.38/grsecu= rity/grsec_tpe.c ---- linux-2.6.32.38/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/grsecurity/grsec_tpe.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/grsecurity/grsec_tpe.c linux-2.6.32.39/grsecu= rity/grsec_tpe.c +--- linux-2.6.32.39/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/grsecurity/grsec_tpe.c 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,39 @@ +#include +#include @@ -46727,9 +44874,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_tpe.c= linux-2.6.32.38/grsecurity/grs +#endif + return 1; +} -diff -urNp linux-2.6.32.38/grsecurity/grsum.c linux-2.6.32.38/grsecurity= /grsum.c ---- linux-2.6.32.38/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.32.38/grsecurity/grsum.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/grsecurity/grsum.c linux-2.6.32.39/grsecurity= /grsum.c +--- linux-2.6.32.39/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -05= 00 ++++ linux-2.6.32.39/grsecurity/grsum.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -0,0 +1,61 @@ +#include +#include @@ -46792,9 +44939,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsum.c lin= ux-2.6.32.38/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.32.38/grsecurity/Kconfig linux-2.6.32.38/grsecurity= /Kconfig ---- linux-2.6.32.38/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.32.38/grsecurity/Kconfig 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/grsecurity/Kconfig linux-2.6.32.39/grsecurity= /Kconfig +--- linux-2.6.32.39/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -05= 00 ++++ linux-2.6.32.39/grsecurity/Kconfig 2011-04-17 15:56:46.000000000 -04= 00 @@ -0,0 +1,1045 @@ +# +# grecurity configuration @@ -47841,9 +45988,9 @@ diff -urNp linux-2.6.32.38/grsecurity/Kconfig lin= ux-2.6.32.38/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.32.38/grsecurity/Makefile linux-2.6.32.38/grsecurit= y/Makefile ---- linux-2.6.32.38/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0= 500 -+++ linux-2.6.32.38/grsecurity/Makefile 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/grsecurity/Makefile linux-2.6.32.39/grsecurit= y/Makefile +--- linux-2.6.32.39/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0= 500 ++++ linux-2.6.32.39/grsecurity/Makefile 2011-04-17 15:56:46.000000000 -0= 400 @@ -0,0 +1,29 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dal= ton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -47874,23 +46021,9 @@ diff -urNp linux-2.6.32.38/grsecurity/Makefile l= inux-2.6.32.38/grsecurity/Makefi + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.32.38/include/acpi/acoutput.h linux-2.6.32.38/inclu= de/acpi/acoutput.h ---- linux-2.6.32.38/include/acpi/acoutput.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/acpi/acoutput.h 2011-04-17 15:56:46.00000000= 0 -0400 -@@ -264,8 +264,8 @@ - * leaving no executable debug code! - */ - #define ACPI_FUNCTION_NAME(a) --#define ACPI_DEBUG_PRINT(pl) --#define ACPI_DEBUG_PRINT_RAW(pl) -+#define ACPI_DEBUG_PRINT(pl) do {} while (0) -+#define ACPI_DEBUG_PRINT_RAW(pl) do {} while (0) -=20 - #endif /* ACPI_DEBUG_OUTPUT */ -=20 -diff -urNp linux-2.6.32.38/include/acpi/acpi_drivers.h linux-2.6.32.38/i= nclude/acpi/acpi_drivers.h ---- linux-2.6.32.38/include/acpi/acpi_drivers.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/include/acpi/acpi_drivers.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/include/acpi/acpi_drivers.h linux-2.6.32.39/i= nclude/acpi/acpi_drivers.h +--- linux-2.6.32.39/include/acpi/acpi_drivers.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/include/acpi/acpi_drivers.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station ---------------------------------------------------------------------= ----- */ @@ -47920,9 +46053,9 @@ diff -urNp linux-2.6.32.38/include/acpi/acpi_driv= ers.h linux-2.6.32.38/include/a void *context) { return -ENODEV; -diff -urNp linux-2.6.32.38/include/asm-generic/atomic-long.h linux-2.6.3= 2.38/include/asm-generic/atomic-long.h ---- linux-2.6.32.38/include/asm-generic/atomic-long.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/atomic-long.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/atomic-long.h linux-2.6.3= 2.39/include/asm-generic/atomic-long.h +--- linux-2.6.32.39/include/asm-generic/atomic-long.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/atomic-long.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -22,6 +22,12 @@ =20 typedef atomic64_t atomic_long_t; @@ -48179,9 +46312,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/at= omic-long.h linux-2.6.32.38/inc +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.32.38/include/asm-generic/dma-mapping-common.h linu= x-2.6.32.38/include/asm-generic/dma-mapping-common.h ---- linux-2.6.32.38/include/asm-generic/dma-mapping-common.h 2011-03-27 = 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/dma-mapping-common.h 2011-04-17 = 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/dma-mapping-common.h linu= x-2.6.32.39/include/asm-generic/dma-mapping-common.h +--- linux-2.6.32.39/include/asm-generic/dma-mapping-common.h 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/dma-mapping-common.h 2011-04-17 = 15:56:46.000000000 -0400 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -48290,9 +46423,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/dm= a-mapping-common.h linux-2.6.32 =20 BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.32.38/include/asm-generic/futex.h linux-2.6.32.38/i= nclude/asm-generic/futex.h ---- linux-2.6.32.38/include/asm-generic/futex.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/include/asm-generic/futex.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/futex.h linux-2.6.32.39/i= nclude/asm-generic/futex.h +--- linux-2.6.32.39/include/asm-generic/futex.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/include/asm-generic/futex.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -6,7 +6,7 @@ #include =20 @@ -48311,9 +46444,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/fu= tex.h linux-2.6.32.38/include/a { return -ENOSYS; } -diff -urNp linux-2.6.32.38/include/asm-generic/int-l64.h linux-2.6.32.38= /include/asm-generic/int-l64.h ---- linux-2.6.32.38/include/asm-generic/int-l64.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/int-l64.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/int-l64.h linux-2.6.32.39= /include/asm-generic/int-l64.h +--- linux-2.6.32.39/include/asm-generic/int-l64.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/int-l64.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -48323,9 +46456,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/in= t-l64.h linux-2.6.32.38/include #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.38/include/asm-generic/int-ll64.h linux-2.6.32.3= 8/include/asm-generic/int-ll64.h ---- linux-2.6.32.38/include/asm-generic/int-ll64.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/int-ll64.h 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/int-ll64.h linux-2.6.32.3= 9/include/asm-generic/int-ll64.h +--- linux-2.6.32.39/include/asm-generic/int-ll64.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/int-ll64.h 2011-04-17 15:56:46.0= 00000000 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -48335,9 +46468,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/in= t-ll64.h linux-2.6.32.38/includ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.38/include/asm-generic/kmap_types.h linux-2.6.32= .38/include/asm-generic/kmap_types.h ---- linux-2.6.32.38/include/asm-generic/kmap_types.h 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/kmap_types.h 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/kmap_types.h linux-2.6.32= .39/include/asm-generic/kmap_types.h +--- linux-2.6.32.39/include/asm-generic/kmap_types.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/kmap_types.h 2011-04-17 15:56:46= .000000000 -0400 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, @@ -48348,9 +46481,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/km= ap_types.h linux-2.6.32.38/incl }; =20 #undef KMAP_D -diff -urNp linux-2.6.32.38/include/asm-generic/pgtable.h linux-2.6.32.38= /include/asm-generic/pgtable.h ---- linux-2.6.32.38/include/asm-generic/pgtable.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/pgtable.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/pgtable.h linux-2.6.32.39= /include/asm-generic/pgtable.h +--- linux-2.6.32.39/include/asm-generic/pgtable.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/pgtable.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -48366,9 +46499,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/pg= table.h linux-2.6.32.38/include #endif /* !__ASSEMBLY__ */ =20 #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.32.38/include/asm-generic/pgtable-nopmd.h linux-2.6= .32.38/include/asm-generic/pgtable-nopmd.h ---- linux-2.6.32.38/include/asm-generic/pgtable-nopmd.h 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h linux-2.6= .32.39/include/asm-generic/pgtable-nopmd.h +--- linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:56= :46.000000000 -0400 @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -48405,9 +46538,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/pg= table-nopmd.h linux-2.6.32.38/i /* * The "pud_xxx()" functions here are trivial for a folded two-level * setup: the pmd is never bad, and a pmd always exists (as it's folded -diff -urNp linux-2.6.32.38/include/asm-generic/pgtable-nopud.h linux-2.6= .32.38/include/asm-generic/pgtable-nopud.h ---- linux-2.6.32.38/include/asm-generic/pgtable-nopud.h 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/pgtable-nopud.h 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/pgtable-nopud.h linux-2.6= .32.39/include/asm-generic/pgtable-nopud.h +--- linux-2.6.32.39/include/asm-generic/pgtable-nopud.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/pgtable-nopud.h 2011-04-17 15:56= :46.000000000 -0400 @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -48438,9 +46571,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/pg= table-nopud.h linux-2.6.32.38/i /* * The "pgd_xxx()" functions here are trivial for a folded two-level * setup: the pud is never bad, and a pud always exists (as it's folded -diff -urNp linux-2.6.32.38/include/asm-generic/vmlinux.lds.h linux-2.6.3= 2.38/include/asm-generic/vmlinux.lds.h ---- linux-2.6.32.38/include/asm-generic/vmlinux.lds.h 2011-03-27 14:31:4= 7.000000000 -0400 -+++ linux-2.6.32.38/include/asm-generic/vmlinux.lds.h 2011-04-17 15:56:4= 6.000000000 -0400 +diff -urNp linux-2.6.32.39/include/asm-generic/vmlinux.lds.h linux-2.6.3= 2.39/include/asm-generic/vmlinux.lds.h +--- linux-2.6.32.39/include/asm-generic/vmlinux.lds.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.39/include/asm-generic/vmlinux.lds.h 2011-04-17 15:56:4= 6.000000000 -0400 @@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) =3D .; \ @@ -48479,115 +46612,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/= vmlinux.lds.h linux-2.6.32.38/inc =20 /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.32.38/include/drm/drm_pciids.h linux-2.6.32.38/incl= ude/drm/drm_pciids.h ---- linux-2.6.32.38/include/drm/drm_pciids.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/drm/drm_pciids.h 2011-04-17 15:56:46.0000000= 00 -0400 -@@ -376,7 +376,7 @@ - {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MO= BILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ - {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_M= EMMAP|RADEON_IS_IGP}, \ - {0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_M= EMMAP|RADEON_IS_IGP}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define r128_PCI_IDS \ - {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -416,14 +416,14 @@ - {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define mga_PCI_IDS \ - {0x102b, 0x0520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ - {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ - {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G400}, \ - {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G550}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define mach64_PCI_IDS \ - {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -446,7 +446,7 @@ - {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define sisdrv_PCI_IDS \ - {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -457,7 +457,7 @@ - {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ - {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define tdfx_PCI_IDS \ - {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -466,7 +466,7 @@ - {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define viadrv_PCI_IDS \ - {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -478,14 +478,14 @@ - {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \ - {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define i810_PCI_IDS \ - {0x8086, 0x7121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x7123, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x7125, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x1132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define i830_PCI_IDS \ - {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -493,11 +493,11 @@ - {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define gamma_PCI_IDS \ - {0x3d3d, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define savage_PCI_IDS \ - {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \ -@@ -523,10 +523,10 @@ - {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \ - {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ - {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define ffb_PCI_IDS \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define i915_PCI_IDS \ - {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0= xffff00, 0}, \ -@@ -559,4 +559,4 @@ - {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0= xffff00, 0}, \ - {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0= xffff00, 0}, \ - {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0= xffff00, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.32.38/include/drm/drmP.h linux-2.6.32.38/include/dr= m/drmP.h ---- linux-2.6.32.38/include/drm/drmP.h 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/include/drm/drmP.h 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/include/drm/drmP.h linux-2.6.32.39/include/dr= m/drmP.h +--- linux-2.6.32.39/include/drm/drmP.h 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/include/drm/drmP.h 2011-04-17 15:56:46.000000000 -04= 00 @@ -71,6 +71,7 @@ #include #include @@ -48647,9 +46674,9 @@ diff -urNp linux-2.6.32.38/include/drm/drmP.h lin= ux-2.6.32.38/include/drm/drmP.h uint32_t gtt_total; uint32_t invalidate_domains; /* domains pending invalidation */ uint32_t flush_domains; /* domains pending flush */ -diff -urNp linux-2.6.32.38/include/linux/a.out.h linux-2.6.32.38/include= /linux/a.out.h ---- linux-2.6.32.38/include/linux/a.out.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/a.out.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/a.out.h linux-2.6.32.39/include= /linux/a.out.h +--- linux-2.6.32.39/include/linux/a.out.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/a.out.h 2011-04-17 15:56:46.000000000 = -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 =3D 152 /* MIPS R6000/R4000 binary */ }; @@ -48665,9 +46692,9 @@ diff -urNp linux-2.6.32.38/include/linux/a.out.h = linux-2.6.32.38/include/linux/a #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.32.38/include/linux/atmdev.h linux-2.6.32.38/includ= e/linux/atmdev.h ---- linux-2.6.32.38/include/linux/atmdev.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/atmdev.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/atmdev.h linux-2.6.32.39/includ= e/linux/atmdev.h +--- linux-2.6.32.39/include/linux/atmdev.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/atmdev.h 2011-04-17 15:56:46.000000000= -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif =20 @@ -48677,9 +46704,9 @@ diff -urNp linux-2.6.32.38/include/linux/atmdev.h= linux-2.6.32.38/include/linux/ __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.38/include/linux/backlight.h linux-2.6.32.38/inc= lude/linux/backlight.h ---- linux-2.6.32.38/include/linux/backlight.h 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/include/linux/backlight.h 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/include/linux/backlight.h linux-2.6.32.39/inc= lude/linux/backlight.h +--- linux-2.6.32.39/include/linux/backlight.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/include/linux/backlight.h 2011-04-17 15:56:46.000000= 000 -0400 @@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; =20 @@ -48721,9 +46748,9 @@ diff -urNp linux-2.6.32.38/include/linux/backligh= t.h linux-2.6.32.38/include/lin extern void backlight_device_unregister(struct backlight_device *bd); extern void backlight_force_update(struct backlight_device *bd, enum backlight_update_reason reason); -diff -urNp linux-2.6.32.38/include/linux/binfmts.h linux-2.6.32.38/inclu= de/linux/binfmts.h ---- linux-2.6.32.38/include/linux/binfmts.h 2011-04-17 17:00:52.00000000= 0 -0400 -+++ linux-2.6.32.38/include/linux/binfmts.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/linux/binfmts.h linux-2.6.32.39/inclu= de/linux/binfmts.h +--- linux-2.6.32.39/include/linux/binfmts.h 2011-04-17 17:00:52.00000000= 0 -0400 ++++ linux-2.6.32.39/include/linux/binfmts.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -83,6 +83,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -48732,9 +46759,9 @@ diff -urNp linux-2.6.32.38/include/linux/binfmts.= h linux-2.6.32.38/include/linux unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.32.38/include/linux/blkdev.h linux-2.6.32.38/includ= e/linux/blkdev.h ---- linux-2.6.32.38/include/linux/blkdev.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/blkdev.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/blkdev.h linux-2.6.32.39/includ= e/linux/blkdev.h +--- linux-2.6.32.39/include/linux/blkdev.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/blkdev.h 2011-04-17 15:56:46.000000000= -0400 @@ -1265,19 +1265,19 @@ static inline int blk_integrity_rq(struc #endif /* CONFIG_BLK_DEV_INTEGRITY */ =20 @@ -48766,9 +46793,9 @@ diff -urNp linux-2.6.32.38/include/linux/blkdev.h= linux-2.6.32.38/include/linux/ }; =20 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsign= ed int, -diff -urNp linux-2.6.32.38/include/linux/byteorder/little_endian.h linux= -2.6.32.38/include/linux/byteorder/little_endian.h ---- linux-2.6.32.38/include/linux/byteorder/little_endian.h 2011-03-27 1= 4:31:47.000000000 -0400 -+++ linux-2.6.32.38/include/linux/byteorder/little_endian.h 2011-04-17 1= 5:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/byteorder/little_endian.h linux= -2.6.32.39/include/linux/byteorder/little_endian.h +--- linux-2.6.32.39/include/linux/byteorder/little_endian.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.39/include/linux/byteorder/little_endian.h 2011-04-17 1= 5:56:46.000000000 -0400 @@ -42,51 +42,51 @@ =20 static inline __le64 __cpu_to_le64p(const __u64 *p) @@ -48833,9 +46860,9 @@ diff -urNp linux-2.6.32.38/include/linux/byteorde= r/little_endian.h linux-2.6.32. } #define __cpu_to_le64s(x) do { (void)(x); } while (0) #define __le64_to_cpus(x) do { (void)(x); } while (0) -diff -urNp linux-2.6.32.38/include/linux/cache.h linux-2.6.32.38/include= /linux/cache.h ---- linux-2.6.32.38/include/linux/cache.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/cache.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/cache.h linux-2.6.32.39/include= /linux/cache.h +--- linux-2.6.32.39/include/linux/cache.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/cache.h 2011-04-17 15:56:46.000000000 = -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -48847,9 +46874,9 @@ diff -urNp linux-2.6.32.38/include/linux/cache.h = linux-2.6.32.38/include/linux/c #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTE= S))) #endif -diff -urNp linux-2.6.32.38/include/linux/capability.h linux-2.6.32.38/in= clude/linux/capability.h ---- linux-2.6.32.38/include/linux/capability.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/include/linux/capability.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/include/linux/capability.h linux-2.6.32.39/in= clude/linux/capability.h +--- linux-2.6.32.39/include/linux/capability.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/include/linux/capability.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) =3D=3D 0) =20 @@ -48858,9 +46885,9 @@ diff -urNp linux-2.6.32.38/include/linux/capabili= ty.h linux-2.6.32.38/include/li =20 /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.32.38/include/linux/compiler-gcc4.h linux-2.6.32.38= /include/linux/compiler-gcc4.h ---- linux-2.6.32.38/include/linux/compiler-gcc4.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/include/linux/compiler-gcc4.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/compiler-gcc4.h linux-2.6.32.39= /include/linux/compiler-gcc4.h +--- linux-2.6.32.39/include/linux/compiler-gcc4.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/include/linux/compiler-gcc4.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -36,4 +36,8 @@ the kernel context */ #define __cold __attribute__((__cold__)) @@ -48870,9 +46897,9 @@ diff -urNp linux-2.6.32.38/include/linux/compiler= -gcc4.h linux-2.6.32.38/include +#define __bos0(ptr) __bos((ptr), 0) +#define __bos1(ptr) __bos((ptr), 1) #endif -diff -urNp linux-2.6.32.38/include/linux/compiler.h linux-2.6.32.38/incl= ude/linux/compiler.h ---- linux-2.6.32.38/include/linux/compiler.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/linux/compiler.h 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/include/linux/compiler.h linux-2.6.32.39/incl= ude/linux/compiler.h +--- linux-2.6.32.39/include/linux/compiler.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/include/linux/compiler.h 2011-04-17 15:56:46.0000000= 00 -0400 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -48905,9 +46932,21 @@ diff -urNp linux-2.6.32.38/include/linux/compile= r.h linux-2.6.32.38/include/linu +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) =20 #endif /* __LINUX_COMPILER_H */ -diff -urNp linux-2.6.32.38/include/linux/decompress/mm.h linux-2.6.32.38= /include/linux/decompress/mm.h ---- linux-2.6.32.38/include/linux/decompress/mm.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/include/linux/decompress/mm.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/dcache.h linux-2.6.32.39/includ= e/linux/dcache.h +--- linux-2.6.32.39/include/linux/dcache.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/dcache.h 2011-04-23 13:34:46.000000000= -0400 +@@ -119,6 +119,8 @@ struct dentry { + unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */ + }; +=20 ++#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,= d_iname)) ++ + /* + * dentry->d_lock spinlock nesting subclasses: + * +diff -urNp linux-2.6.32.39/include/linux/decompress/mm.h linux-2.6.32.39= /include/linux/decompress/mm.h +--- linux-2.6.32.39/include/linux/decompress/mm.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/include/linux/decompress/mm.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -78,7 +78,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -48917,9 +46956,9 @@ diff -urNp linux-2.6.32.38/include/linux/decompre= ss/mm.h linux-2.6.32.38/include #define free(a) kfree(a) =20 #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.32.38/include/linux/dma-mapping.h linux-2.6.32.38/i= nclude/linux/dma-mapping.h ---- linux-2.6.32.38/include/linux/dma-mapping.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/include/linux/dma-mapping.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/include/linux/dma-mapping.h linux-2.6.32.39/i= nclude/linux/dma-mapping.h +--- linux-2.6.32.39/include/linux/dma-mapping.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/include/linux/dma-mapping.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -16,50 +16,50 @@ enum dma_data_direction { }; =20 @@ -48986,9 +47025,9 @@ diff -urNp linux-2.6.32.38/include/linux/dma-mapp= ing.h linux-2.6.32.38/include/l }; =20 #define DMA_BIT_MASK(n) (((n) =3D=3D 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.32.38/include/linux/dst.h linux-2.6.32.38/include/l= inux/dst.h ---- linux-2.6.32.38/include/linux/dst.h 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/include/linux/dst.h 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/include/linux/dst.h linux-2.6.32.39/include/l= inux/dst.h +--- linux-2.6.32.39/include/linux/dst.h 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/include/linux/dst.h 2011-04-17 15:56:46.000000000 -0= 400 @@ -380,7 +380,7 @@ struct dst_node struct thread_pool *pool; =20 @@ -48998,9 +47037,9 @@ diff -urNp linux-2.6.32.38/include/linux/dst.h li= nux-2.6.32.38/include/linux/dst =20 /* * How frequently and how many times transaction -diff -urNp linux-2.6.32.38/include/linux/elf.h linux-2.6.32.38/include/l= inux/elf.h ---- linux-2.6.32.38/include/linux/elf.h 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/include/linux/elf.h 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/include/linux/elf.h linux-2.6.32.39/include/l= inux/elf.h +--- linux-2.6.32.39/include/linux/elf.h 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/include/linux/elf.h 2011-04-17 15:56:46.000000000 -0= 400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 =20 @@ -49073,9 +47112,9 @@ diff -urNp linux-2.6.32.38/include/linux/elf.h li= nux-2.6.32.38/include/linux/elf =20 #endif =20 -diff -urNp linux-2.6.32.38/include/linux/fs.h linux-2.6.32.38/include/li= nux/fs.h ---- linux-2.6.32.38/include/linux/fs.h 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/include/linux/fs.h 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/include/linux/fs.h linux-2.6.32.39/include/li= nux/fs.h +--- linux-2.6.32.39/include/linux/fs.h 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/include/linux/fs.h 2011-04-17 15:56:46.000000000 -04= 00 @@ -90,6 +90,11 @@ struct inodes_stat_t { /* Expect random access pattern */ #define FMODE_RANDOM ((__force fmode_t)4096) @@ -49237,9 +47276,9 @@ diff -urNp linux-2.6.32.38/include/linux/fs.h lin= ux-2.6.32.38/include/linux/fs.h }; =20 /* -diff -urNp linux-2.6.32.38/include/linux/fs_struct.h linux-2.6.32.38/inc= lude/linux/fs_struct.h ---- linux-2.6.32.38/include/linux/fs_struct.h 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/include/linux/fs_struct.h 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/include/linux/fs_struct.h linux-2.6.32.39/inc= lude/linux/fs_struct.h +--- linux-2.6.32.39/include/linux/fs_struct.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/include/linux/fs_struct.h 2011-04-17 15:56:46.000000= 000 -0400 @@ -4,7 +4,7 @@ #include =20 @@ -49249,9 +47288,9 @@ diff -urNp linux-2.6.32.38/include/linux/fs_struc= t.h linux-2.6.32.38/include/lin rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.32.38/include/linux/genhd.h linux-2.6.32.38/include= /linux/genhd.h ---- linux-2.6.32.38/include/linux/genhd.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/genhd.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/genhd.h linux-2.6.32.39/include= /linux/genhd.h +--- linux-2.6.32.39/include/linux/genhd.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/genhd.h 2011-04-17 15:56:46.000000000 = -0400 @@ -161,7 +161,7 @@ struct gendisk { =20 struct timer_rand_state *random; @@ -49261,9 +47300,9 @@ diff -urNp linux-2.6.32.38/include/linux/genhd.h = linux-2.6.32.38/include/linux/g struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.32.38/include/linux/gracl.h linux-2.6.32.38/include= /linux/gracl.h ---- linux-2.6.32.38/include/linux/gracl.h 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.32.38/include/linux/gracl.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/gracl.h linux-2.6.32.39/include= /linux/gracl.h +--- linux-2.6.32.39/include/linux/gracl.h 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.32.39/include/linux/gracl.h 2011-04-17 15:56:46.000000000 = -0400 @@ -0,0 +1,317 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -49582,9 +47621,9 @@ diff -urNp linux-2.6.32.38/include/linux/gracl.h = linux-2.6.32.38/include/linux/g + +#endif + -diff -urNp linux-2.6.32.38/include/linux/gralloc.h linux-2.6.32.38/inclu= de/linux/gralloc.h ---- linux-2.6.32.38/include/linux/gralloc.h 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.32.38/include/linux/gralloc.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/linux/gralloc.h linux-2.6.32.39/inclu= de/linux/gralloc.h +--- linux-2.6.32.39/include/linux/gralloc.h 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.32.39/include/linux/gralloc.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -49595,9 +47634,9 @@ diff -urNp linux-2.6.32.38/include/linux/gralloc.= h linux-2.6.32.38/include/linux +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.32.38/include/linux/grdefs.h linux-2.6.32.38/includ= e/linux/grdefs.h ---- linux-2.6.32.38/include/linux/grdefs.h 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.32.38/include/linux/grdefs.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/grdefs.h linux-2.6.32.39/includ= e/linux/grdefs.h +--- linux-2.6.32.39/include/linux/grdefs.h 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.32.39/include/linux/grdefs.h 2011-04-17 15:56:46.000000000= -0400 @@ -0,0 +1,139 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -49738,9 +47777,9 @@ diff -urNp linux-2.6.32.38/include/linux/grdefs.h= linux-2.6.32.38/include/linux/ +}; + +#endif -diff -urNp linux-2.6.32.38/include/linux/grinternal.h linux-2.6.32.38/in= clude/linux/grinternal.h ---- linux-2.6.32.38/include/linux/grinternal.h 1969-12-31 19:00:00.00000= 0000 -0500 -+++ linux-2.6.32.38/include/linux/grinternal.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/include/linux/grinternal.h linux-2.6.32.39/in= clude/linux/grinternal.h +--- linux-2.6.32.39/include/linux/grinternal.h 1969-12-31 19:00:00.00000= 0000 -0500 ++++ linux-2.6.32.39/include/linux/grinternal.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -0,0 +1,218 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -49960,9 +47999,9 @@ diff -urNp linux-2.6.32.38/include/linux/grintern= al.h linux-2.6.32.38/include/li +#endif + +#endif -diff -urNp linux-2.6.32.38/include/linux/grmsg.h linux-2.6.32.38/include= /linux/grmsg.h ---- linux-2.6.32.38/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.32.38/include/linux/grmsg.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/grmsg.h linux-2.6.32.39/include= /linux/grmsg.h +--- linux-2.6.32.39/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.32.39/include/linux/grmsg.h 2011-04-17 15:56:46.000000000 = -0400 @@ -0,0 +1,108 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, = parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/eui= d:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %= us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/= euid:%u/%u gid/egid:%u/%u" @@ -50072,9 +48111,9 @@ diff -urNp linux-2.6.32.38/include/linux/grmsg.h = linux-2.6.32.38/include/linux/g +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via p= trace by " +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privi= lege to init by " -diff -urNp linux-2.6.32.38/include/linux/grsecurity.h linux-2.6.32.38/in= clude/linux/grsecurity.h ---- linux-2.6.32.38/include/linux/grsecurity.h 1969-12-31 19:00:00.00000= 0000 -0500 -+++ linux-2.6.32.38/include/linux/grsecurity.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/include/linux/grsecurity.h linux-2.6.32.39/in= clude/linux/grsecurity.h +--- linux-2.6.32.39/include/linux/grsecurity.h 1969-12-31 19:00:00.00000= 0000 -0500 ++++ linux-2.6.32.39/include/linux/grsecurity.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -0,0 +1,212 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -50288,9 +48327,9 @@ diff -urNp linux-2.6.32.38/include/linux/grsecuri= ty.h linux-2.6.32.38/include/li +#endif + +#endif -diff -urNp linux-2.6.32.38/include/linux/hdpu_features.h linux-2.6.32.38= /include/linux/hdpu_features.h ---- linux-2.6.32.38/include/linux/hdpu_features.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/include/linux/hdpu_features.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/hdpu_features.h linux-2.6.32.39= /include/linux/hdpu_features.h +--- linux-2.6.32.39/include/linux/hdpu_features.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/include/linux/hdpu_features.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -3,7 +3,7 @@ struct cpustate_t { spinlock_t lock; @@ -50300,9 +48339,9 @@ diff -urNp linux-2.6.32.38/include/linux/hdpu_fea= tures.h linux-2.6.32.38/include unsigned char cached_val; int inited; unsigned long *set_addr; -diff -urNp linux-2.6.32.38/include/linux/highmem.h linux-2.6.32.38/inclu= de/linux/highmem.h ---- linux-2.6.32.38/include/linux/highmem.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/linux/highmem.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/linux/highmem.h linux-2.6.32.39/inclu= de/linux/highmem.h +--- linux-2.6.32.39/include/linux/highmem.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/linux/highmem.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -50322,9 +48361,9 @@ diff -urNp linux-2.6.32.38/include/linux/highmem.= h linux-2.6.32.38/include/linux static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.32.38/include/linux/init_task.h linux-2.6.32.38/inc= lude/linux/init_task.h ---- linux-2.6.32.38/include/linux/init_task.h 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/include/linux/init_task.h 2011-04-18 18:02:57.000000= 000 -0400 +diff -urNp linux-2.6.32.39/include/linux/init_task.h linux-2.6.32.39/inc= lude/linux/init_task.h +--- linux-2.6.32.39/include/linux/init_task.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/include/linux/init_task.h 2011-04-18 18:02:57.000000= 000 -0400 @@ -83,6 +83,12 @@ extern struct group_info init_groups; #define INIT_IDS #endif @@ -50346,9 +48385,9 @@ diff -urNp linux-2.6.32.38/include/linux/init_tas= k.h linux-2.6.32.38/include/lin .fs =3D &init_fs, \ .files =3D &init_files, \ .signal =3D &init_signals, \ -diff -urNp linux-2.6.32.38/include/linux/interrupt.h linux-2.6.32.38/inc= lude/linux/interrupt.h ---- linux-2.6.32.38/include/linux/interrupt.h 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/include/linux/interrupt.h 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/include/linux/interrupt.h linux-2.6.32.39/inc= lude/linux/interrupt.h +--- linux-2.6.32.39/include/linux/interrupt.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/include/linux/interrupt.h 2011-04-17 15:56:46.000000= 000 -0400 @@ -362,7 +362,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -50373,9 +48412,9 @@ diff -urNp linux-2.6.32.38/include/linux/interrup= t.h linux-2.6.32.38/include/lin extern void softirq_init(void); #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr))= ; } while (0) extern void raise_softirq_irqoff(unsigned int nr); -diff -urNp linux-2.6.32.38/include/linux/irq.h linux-2.6.32.38/include/l= inux/irq.h ---- linux-2.6.32.38/include/linux/irq.h 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/include/linux/irq.h 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/include/linux/irq.h linux-2.6.32.39/include/l= inux/irq.h +--- linux-2.6.32.39/include/linux/irq.h 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/include/linux/irq.h 2011-04-17 15:56:46.000000000 -0= 400 @@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq, static inline bool alloc_desc_masks(struct irq_desc *desc, int node, bool boot) @@ -50390,33 +48429,9 @@ diff -urNp linux-2.6.32.38/include/linux/irq.h l= inux-2.6.32.38/include/linux/irq if (!alloc_cpumask_var_node(&desc->affinity, gfp, node)) return false; =20 -diff -urNp linux-2.6.32.38/include/linux/jbd2.h linux-2.6.32.38/include/= linux/jbd2.h ---- linux-2.6.32.38/include/linux/jbd2.h 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/include/linux/jbd2.h 2011-04-17 15:56:46.000000000 -= 0400 -@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; - } \ - } while (0) - #else --#define jbd_debug(f, a...) /**/ -+#define jbd_debug(f, a...) do {} while (0) - #endif -=20 - static inline void *jbd2_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.38/include/linux/jbd.h linux-2.6.32.38/include/l= inux/jbd.h ---- linux-2.6.32.38/include/linux/jbd.h 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/include/linux/jbd.h 2011-04-17 15:56:46.000000000 -0= 400 -@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; - } \ - } while (0) - #else --#define jbd_debug(f, a...) /**/ -+#define jbd_debug(f, a...) do {} while (0) - #endif -=20 - static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.38/include/linux/kallsyms.h linux-2.6.32.38/incl= ude/linux/kallsyms.h ---- linux-2.6.32.38/include/linux/kallsyms.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/linux/kallsyms.h 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/include/linux/kallsyms.h linux-2.6.32.39/incl= ude/linux/kallsyms.h +--- linux-2.6.32.39/include/linux/kallsyms.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/include/linux/kallsyms.h 2011-04-17 15:56:46.0000000= 00 -0400 @@ -15,7 +15,8 @@ =20 struct module; @@ -50443,9 +48458,9 @@ diff -urNp linux-2.6.32.38/include/linux/kallsyms= .h linux-2.6.32.38/include/linu =20 /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.32.38/include/linux/kgdb.h linux-2.6.32.38/include/= linux/kgdb.h ---- linux-2.6.32.38/include/linux/kgdb.h 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/include/linux/kgdb.h 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/include/linux/kgdb.h linux-2.6.32.39/include/= linux/kgdb.h +--- linux-2.6.32.39/include/linux/kgdb.h 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/include/linux/kgdb.h 2011-04-17 15:56:46.000000000 -= 0400 @@ -251,20 +251,20 @@ struct kgdb_arch { */ struct kgdb_io { @@ -50476,9 +48491,9 @@ diff -urNp linux-2.6.32.38/include/linux/kgdb.h l= inux-2.6.32.38/include/linux/kg =20 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern int kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.32.38/include/linux/kmod.h linux-2.6.32.38/include/= linux/kmod.h ---- linux-2.6.32.38/include/linux/kmod.h 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/include/linux/kmod.h 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/include/linux/kmod.h linux-2.6.32.39/include/= linux/kmod.h +--- linux-2.6.32.39/include/linux/kmod.h 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/include/linux/kmod.h 2011-04-17 15:56:46.000000000 -= 0400 @@ -31,6 +31,8 @@ * usually useless though. */ extern int __request_module(bool wait, const char *name, ...) \ @@ -50488,9 +48503,9 @@ diff -urNp linux-2.6.32.38/include/linux/kmod.h l= inux-2.6.32.38/include/linux/km #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ -diff -urNp linux-2.6.32.38/include/linux/kobject.h linux-2.6.32.38/inclu= de/linux/kobject.h ---- linux-2.6.32.38/include/linux/kobject.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/linux/kobject.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/linux/kobject.h linux-2.6.32.39/inclu= de/linux/kobject.h +--- linux-2.6.32.39/include/linux/kobject.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/linux/kobject.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob =20 struct kobj_type { @@ -50539,9 +48554,9 @@ diff -urNp linux-2.6.32.38/include/linux/kobject.= h linux-2.6.32.38/include/linux struct kobject *parent_kobj); =20 static inline struct kset *to_kset(struct kobject *kobj) -diff -urNp linux-2.6.32.38/include/linux/kvm_host.h linux-2.6.32.38/incl= ude/linux/kvm_host.h ---- linux-2.6.32.38/include/linux/kvm_host.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/linux/kvm_host.h 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/include/linux/kvm_host.h linux-2.6.32.39/incl= ude/linux/kvm_host.h +--- linux-2.6.32.39/include/linux/kvm_host.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/include/linux/kvm_host.h 2011-04-17 15:56:46.0000000= 00 -0400 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -50560,24 +48575,9 @@ diff -urNp linux-2.6.32.38/include/linux/kvm_hos= t.h linux-2.6.32.38/include/linu void kvm_arch_exit(void); =20 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.32.38/include/linux/libata.h linux-2.6.32.38/includ= e/linux/libata.h ---- linux-2.6.32.38/include/linux/libata.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/libata.h 2011-04-17 15:56:46.000000000= -0400 -@@ -64,11 +64,11 @@ - #ifdef ATA_VERBOSE_DEBUG - #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## = args) - #else --#define VPRINTK(fmt, args...) -+#define VPRINTK(fmt, args...) do {} while (0) - #endif /* ATA_VERBOSE_DEBUG */ - #else --#define DPRINTK(fmt, args...) --#define VPRINTK(fmt, args...) -+#define DPRINTK(fmt, args...) do {} while (0) -+#define VPRINTK(fmt, args...) do {} while (0) - #endif /* ATA_DEBUG */ -=20 - #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk= (KERN_ERR "%s: " fmt, __func__, ## args) +diff -urNp linux-2.6.32.39/include/linux/libata.h linux-2.6.32.39/includ= e/linux/libata.h +--- linux-2.6.32.39/include/linux/libata.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/libata.h 2011-04-23 12:56:11.000000000= -0400 @@ -525,11 +525,11 @@ struct ata_ioports { =20 struct ata_host { @@ -50628,9 +48628,9 @@ diff -urNp linux-2.6.32.38/include/linux/libata.h= linux-2.6.32.38/include/linux/ extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user= *arg); extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct= scsi_cmnd *)); -diff -urNp linux-2.6.32.38/include/linux/lockd/bind.h linux-2.6.32.38/in= clude/linux/lockd/bind.h ---- linux-2.6.32.38/include/linux/lockd/bind.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/include/linux/lockd/bind.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/include/linux/lockd/bind.h linux-2.6.32.39/in= clude/linux/lockd/bind.h +--- linux-2.6.32.39/include/linux/lockd/bind.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/include/linux/lockd/bind.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -50648,9 +48648,9 @@ diff -urNp linux-2.6.32.38/include/linux/lockd/bi= nd.h linux-2.6.32.38/include/li =20 /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.32.38/include/linux/mm.h linux-2.6.32.38/include/li= nux/mm.h ---- linux-2.6.32.38/include/linux/mm.h 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/include/linux/mm.h 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/include/linux/mm.h linux-2.6.32.39/include/li= nux/mm.h +--- linux-2.6.32.39/include/linux/mm.h 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/include/linux/mm.h 2011-04-17 15:56:46.000000000 -04= 00 @@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void=20 =20 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pag= es */ @@ -50730,9 +48730,9 @@ diff -urNp linux-2.6.32.38/include/linux/mm.h lin= ux-2.6.32.38/include/linux/mm.h =20 #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.32.38/include/linux/mm_types.h linux-2.6.32.38/incl= ude/linux/mm_types.h ---- linux-2.6.32.38/include/linux/mm_types.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/linux/mm_types.h 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/include/linux/mm_types.h linux-2.6.32.39/incl= ude/linux/mm_types.h +--- linux-2.6.32.39/include/linux/mm_types.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/include/linux/mm_types.h 2011-04-17 15:56:46.0000000= 00 -0400 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -50767,9 +48767,9 @@ diff -urNp linux-2.6.32.38/include/linux/mm_types= .h linux-2.6.32.38/include/linu }; =20 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.32.38/include/linux/mmu_notifier.h linux-2.6.32.38/= include/linux/mmu_notifier.h ---- linux-2.6.32.38/include/linux/mmu_notifier.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/include/linux/mmu_notifier.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/mmu_notifier.h linux-2.6.32.39/= include/linux/mmu_notifier.h +--- linux-2.6.32.39/include/linux/mmu_notifier.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/include/linux/mmu_notifier.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -50786,9 +48786,9 @@ diff -urNp linux-2.6.32.38/include/linux/mmu_noti= fier.h linux-2.6.32.38/include/ }) =20 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ -diff -urNp linux-2.6.32.38/include/linux/mmzone.h linux-2.6.32.38/includ= e/linux/mmzone.h ---- linux-2.6.32.38/include/linux/mmzone.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/mmzone.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/mmzone.h linux-2.6.32.39/includ= e/linux/mmzone.h +--- linux-2.6.32.39/include/linux/mmzone.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/mmzone.h 2011-04-17 15:56:46.000000000= -0400 @@ -350,7 +350,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ =20 @@ -50798,9 +48798,9 @@ diff -urNp linux-2.6.32.38/include/linux/mmzone.h= linux-2.6.32.38/include/linux/ =20 /* * prev_priority holds the scanning priority for this zone. It is -diff -urNp linux-2.6.32.38/include/linux/mod_devicetable.h linux-2.6.32.= 38/include/linux/mod_devicetable.h ---- linux-2.6.32.38/include/linux/mod_devicetable.h 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/include/linux/mod_devicetable.h 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/mod_devicetable.h linux-2.6.32.= 39/include/linux/mod_devicetable.h +--- linux-2.6.32.39/include/linux/mod_devicetable.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/include/linux/mod_devicetable.h 2011-04-17 15:56:46.= 000000000 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -50819,9 +48819,9 @@ diff -urNp linux-2.6.32.38/include/linux/mod_devi= cetable.h linux-2.6.32.38/inclu =20 struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.32.38/include/linux/module.h linux-2.6.32.38/includ= e/linux/module.h ---- linux-2.6.32.38/include/linux/module.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/module.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/module.h linux-2.6.32.39/includ= e/linux/module.h +--- linux-2.6.32.39/include/linux/module.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/module.h 2011-04-17 15:56:46.000000000= -0400 @@ -287,16 +287,16 @@ struct module int (*init)(void); =20 @@ -50894,9 +48894,9 @@ diff -urNp linux-2.6.32.38/include/linux/module.h= linux-2.6.32.38/include/linux/ } =20 /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.32.38/include/linux/moduleloader.h linux-2.6.32.38/= include/linux/moduleloader.h ---- linux-2.6.32.38/include/linux/moduleloader.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/include/linux/moduleloader.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/moduleloader.h linux-2.6.32.39/= include/linux/moduleloader.h +--- linux-2.6.32.39/include/linux/moduleloader.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/include/linux/moduleloader.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -50919,9 +48919,9 @@ diff -urNp linux-2.6.32.38/include/linux/modulelo= ader.h linux-2.6.32.38/include/ /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.32.38/include/linux/moduleparam.h linux-2.6.32.38/i= nclude/linux/moduleparam.h ---- linux-2.6.32.38/include/linux/moduleparam.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/include/linux/moduleparam.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/include/linux/moduleparam.h linux-2.6.32.39/i= nclude/linux/moduleparam.h +--- linux-2.6.32.39/include/linux/moduleparam.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/include/linux/moduleparam.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -132,7 +132,7 @@ struct kparam_array =20 /* Actually copy string: maxlen param is usually sizeof(string). */ @@ -50940,9 +48940,9 @@ diff -urNp linux-2.6.32.38/include/linux/modulepa= ram.h linux-2.6.32.38/include/l =3D { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\ sizeof(array[0]), array }; \ __module_param_call(MODULE_PARAM_PREFIX, name, \ -diff -urNp linux-2.6.32.38/include/linux/mutex.h linux-2.6.32.38/include= /linux/mutex.h ---- linux-2.6.32.38/include/linux/mutex.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/mutex.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/mutex.h linux-2.6.32.39/include= /linux/mutex.h +--- linux-2.6.32.39/include/linux/mutex.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/mutex.h 2011-04-17 15:56:46.000000000 = -0400 @@ -51,7 +51,7 @@ struct mutex { spinlock_t wait_lock; struct list_head wait_list; @@ -50952,9 +48952,9 @@ diff -urNp linux-2.6.32.38/include/linux/mutex.h = linux-2.6.32.38/include/linux/m #endif #ifdef CONFIG_DEBUG_MUTEXES const char *name; -diff -urNp linux-2.6.32.38/include/linux/namei.h linux-2.6.32.38/include= /linux/namei.h ---- linux-2.6.32.38/include/linux/namei.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/namei.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/namei.h linux-2.6.32.39/include= /linux/namei.h +--- linux-2.6.32.39/include/linux/namei.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/namei.h 2011-04-17 15:56:46.000000000 = -0400 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -50979,9 +48979,9 @@ diff -urNp linux-2.6.32.38/include/linux/namei.h = linux-2.6.32.38/include/linux/n { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.32.38/include/linux/netfilter/xt_gradm.h linux-2.6.= 32.38/include/linux/netfilter/xt_gradm.h ---- linux-2.6.32.38/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:= 00.000000000 -0500 -+++ linux-2.6.32.38/include/linux/netfilter/xt_gradm.h 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/netfilter/xt_gradm.h linux-2.6.= 32.39/include/linux/netfilter/xt_gradm.h +--- linux-2.6.32.39/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:= 00.000000000 -0500 ++++ linux-2.6.32.39/include/linux/netfilter/xt_gradm.h 2011-04-17 15:56:= 46.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef _LINUX_NETFILTER_XT_GRADM_H +#define _LINUX_NETFILTER_XT_GRADM_H 1 @@ -50992,9 +48992,9 @@ diff -urNp linux-2.6.32.38/include/linux/netfilte= r/xt_gradm.h linux-2.6.32.38/in +}; + +#endif -diff -urNp linux-2.6.32.38/include/linux/nodemask.h linux-2.6.32.38/incl= ude/linux/nodemask.h ---- linux-2.6.32.38/include/linux/nodemask.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/linux/nodemask.h 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/include/linux/nodemask.h linux-2.6.32.39/incl= ude/linux/nodemask.h +--- linux-2.6.32.39/include/linux/nodemask.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/include/linux/nodemask.h 2011-04-17 15:56:46.0000000= 00 -0400 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no =20 #define any_online_node(mask) \ @@ -51011,9 +49011,9 @@ diff -urNp linux-2.6.32.38/include/linux/nodemask= .h linux-2.6.32.38/include/linu }) =20 #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.32.38/include/linux/oprofile.h linux-2.6.32.38/incl= ude/linux/oprofile.h ---- linux-2.6.32.38/include/linux/oprofile.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/linux/oprofile.h 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/include/linux/oprofile.h linux-2.6.32.39/incl= ude/linux/oprofile.h +--- linux-2.6.32.39/include/linux/oprofile.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/include/linux/oprofile.h 2011-04-17 15:56:46.0000000= 00 -0400 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry *= root, char const * name, ulong * val); @@ -51026,21 +49026,9 @@ diff -urNp linux-2.6.32.38/include/linux/oprofil= e.h linux-2.6.32.38/include/linu =20 /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry= * root, -diff -urNp linux-2.6.32.38/include/linux/pid.h linux-2.6.32.38/include/l= inux/pid.h ---- linux-2.6.32.38/include/linux/pid.h 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/include/linux/pid.h 2011-04-18 19:20:59.000000000 -0= 400 -@@ -117,7 +117,7 @@ extern struct pid *find_vpid(int nr); - */ - extern struct pid *find_get_pid(int nr); - extern struct pid *find_ge_pid(int nr, struct pid_namespace *); --int next_pidmap(struct pid_namespace *pid_ns, int last); -+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last); -=20 - extern struct pid *alloc_pid(struct pid_namespace *ns); - extern void free_pid(struct pid *pid); -diff -urNp linux-2.6.32.38/include/linux/pipe_fs_i.h linux-2.6.32.38/inc= lude/linux/pipe_fs_i.h ---- linux-2.6.32.38/include/linux/pipe_fs_i.h 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/include/linux/pipe_fs_i.h 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/include/linux/pipe_fs_i.h linux-2.6.32.39/inc= lude/linux/pipe_fs_i.h +--- linux-2.6.32.39/include/linux/pipe_fs_i.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/include/linux/pipe_fs_i.h 2011-04-17 15:56:46.000000= 000 -0400 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; unsigned int nrbufs, curbuf; @@ -51054,9 +49042,9 @@ diff -urNp linux-2.6.32.38/include/linux/pipe_fs_= i.h linux-2.6.32.38/include/lin unsigned int r_counter; unsigned int w_counter; struct fasync_struct *fasync_readers; -diff -urNp linux-2.6.32.38/include/linux/poison.h linux-2.6.32.38/includ= e/linux/poison.h ---- linux-2.6.32.38/include/linux/poison.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/poison.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/poison.h linux-2.6.32.39/includ= e/linux/poison.h +--- linux-2.6.32.39/include/linux/poison.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/poison.h 2011-04-17 15:56:46.000000000= -0400 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -51068,9 +49056,9 @@ diff -urNp linux-2.6.32.38/include/linux/poison.h= linux-2.6.32.38/include/linux/ =20 /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.32.38/include/linux/proc_fs.h linux-2.6.32.38/inclu= de/linux/proc_fs.h ---- linux-2.6.32.38/include/linux/proc_fs.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/linux/proc_fs.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/linux/proc_fs.h linux-2.6.32.39/inclu= de/linux/proc_fs.h +--- linux-2.6.32.39/include/linux/proc_fs.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/linux/proc_fs.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -51091,9 +49079,9 @@ diff -urNp linux-2.6.32.38/include/linux/proc_fs.= h linux-2.6.32.38/include/linux static inline struct proc_dir_entry *create_proc_read_entry(const char = *name, mode_t mode, struct proc_dir_entry *base,=20 read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.32.38/include/linux/ptrace.h linux-2.6.32.38/includ= e/linux/ptrace.h ---- linux-2.6.32.38/include/linux/ptrace.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/ptrace.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/ptrace.h linux-2.6.32.39/includ= e/linux/ptrace.h +--- linux-2.6.32.39/include/linux/ptrace.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/ptrace.h 2011-04-17 15:56:46.000000000= -0400 @@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_ extern void exit_ptrace(struct task_struct *tracer); #define PTRACE_MODE_READ 1 @@ -51107,9 +49095,9 @@ diff -urNp linux-2.6.32.38/include/linux/ptrace.h= linux-2.6.32.38/include/linux/ =20 static inline int ptrace_reparented(struct task_struct *child) { -diff -urNp linux-2.6.32.38/include/linux/random.h linux-2.6.32.38/includ= e/linux/random.h ---- linux-2.6.32.38/include/linux/random.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/random.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/random.h linux-2.6.32.39/includ= e/linux/random.h +--- linux-2.6.32.39/include/linux/random.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/random.h 2011-04-17 15:56:46.000000000= -0400 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -51122,9 +49110,9 @@ diff -urNp linux-2.6.32.38/include/linux/random.h= linux-2.6.32.38/include/linux/ #endif /* __KERNEL___ */ =20 #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.32.38/include/linux/reiserfs_fs.h linux-2.6.32.38/i= nclude/linux/reiserfs_fs.h ---- linux-2.6.32.38/include/linux/reiserfs_fs.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/include/linux/reiserfs_fs.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/include/linux/reiserfs_fs.h linux-2.6.32.39/i= nclude/linux/reiserfs_fs.h +--- linux-2.6.32.39/include/linux/reiserfs_fs.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/include/linux/reiserfs_fs.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ =20 @@ -51171,9 +49159,9 @@ diff -urNp linux-2.6.32.38/include/linux/reiserfs= _fs.h linux-2.6.32.38/include/l =20 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_t= ype (ih)]->bytes_number (ih, bsize) #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_= type (le_key_version (key), key)]->is_left_mergeable (key, bsize) -diff -urNp linux-2.6.32.38/include/linux/reiserfs_fs_sb.h linux-2.6.32.3= 8/include/linux/reiserfs_fs_sb.h ---- linux-2.6.32.38/include/linux/reiserfs_fs_sb.h 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/include/linux/reiserfs_fs_sb.h 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/reiserfs_fs_sb.h linux-2.6.32.3= 9/include/linux/reiserfs_fs_sb.h +--- linux-2.6.32.39/include/linux/reiserfs_fs_sb.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/include/linux/reiserfs_fs_sb.h 2011-04-17 15:56:46.0= 00000000 -0400 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -51183,9 +49171,9 @@ diff -urNp linux-2.6.32.38/include/linux/reiserfs= _fs_sb.h linux-2.6.32.38/includ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.32.38/include/linux/sched.h linux-2.6.32.38/include= /linux/sched.h ---- linux-2.6.32.38/include/linux/sched.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/sched.h 2011-04-18 22:03:00.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/sched.h linux-2.6.32.39/include= /linux/sched.h +--- linux-2.6.32.39/include/linux/sched.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/sched.h 2011-04-18 22:03:00.000000000 = -0400 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; @@ -51423,9 +49411,9 @@ diff -urNp linux-2.6.32.38/include/linux/sched.h = linux-2.6.32.38/include/linux/s extern void thread_info_cache_init(void); =20 #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.32.38/include/linux/screen_info.h linux-2.6.32.38/i= nclude/linux/screen_info.h ---- linux-2.6.32.38/include/linux/screen_info.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/include/linux/screen_info.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/include/linux/screen_info.h linux-2.6.32.39/i= nclude/linux/screen_info.h +--- linux-2.6.32.39/include/linux/screen_info.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/include/linux/screen_info.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -51436,9 +49424,9 @@ diff -urNp linux-2.6.32.38/include/linux/screen_i= nfo.h linux-2.6.32.38/include/l } __attribute__((packed)); =20 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.32.38/include/linux/security.h linux-2.6.32.38/incl= ude/linux/security.h ---- linux-2.6.32.38/include/linux/security.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/linux/security.h 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/include/linux/security.h linux-2.6.32.39/incl= ude/linux/security.h +--- linux-2.6.32.39/include/linux/security.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/include/linux/security.h 2011-04-17 15:56:46.0000000= 00 -0400 @@ -34,6 +34,7 @@ #include #include @@ -51447,9 +49435,9 @@ diff -urNp linux-2.6.32.38/include/linux/security= .h linux-2.6.32.38/include/linu #include =20 /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.32.38/include/linux/shm.h linux-2.6.32.38/include/l= inux/shm.h ---- linux-2.6.32.38/include/linux/shm.h 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/include/linux/shm.h 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/include/linux/shm.h linux-2.6.32.39/include/l= inux/shm.h +--- linux-2.6.32.39/include/linux/shm.h 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/include/linux/shm.h 2011-04-17 15:56:46.000000000 -0= 400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -51461,9 +49449,9 @@ diff -urNp linux-2.6.32.38/include/linux/shm.h li= nux-2.6.32.38/include/linux/shm }; =20 /* shm_mode upper byte flags */ -diff -urNp linux-2.6.32.38/include/linux/skbuff.h linux-2.6.32.38/includ= e/linux/skbuff.h ---- linux-2.6.32.38/include/linux/skbuff.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/skbuff.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/skbuff.h linux-2.6.32.39/includ= e/linux/skbuff.h +--- linux-2.6.32.39/include/linux/skbuff.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/skbuff.h 2011-04-17 15:56:46.000000000= -0400 @@ -544,7 +544,7 @@ static inline union skb_shared_tx *skb_t */ static inline int skb_queue_empty(const struct sk_buff_head *list) @@ -51491,9 +49479,9 @@ diff -urNp linux-2.6.32.38/include/linux/skbuff.h= linux-2.6.32.38/include/linux/ } =20 /** -diff -urNp linux-2.6.32.38/include/linux/slab.h linux-2.6.32.38/include/= linux/slab.h ---- linux-2.6.32.38/include/linux/slab.h 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/include/linux/slab.h 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/include/linux/slab.h linux-2.6.32.39/include/= linux/slab.h +--- linux-2.6.32.39/include/linux/slab.h 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/include/linux/slab.h 2011-04-17 15:56:46.000000000 -= 0400 @@ -11,12 +11,20 @@ =20 #include @@ -51578,9 +49566,9 @@ diff -urNp linux-2.6.32.38/include/linux/slab.h l= inux-2.6.32.38/include/linux/sl +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.32.38/include/linux/slub_def.h linux-2.6.32.38/incl= ude/linux/slub_def.h ---- linux-2.6.32.38/include/linux/slub_def.h 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/include/linux/slub_def.h 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/include/linux/slub_def.h linux-2.6.32.39/incl= ude/linux/slub_def.h +--- linux-2.6.32.39/include/linux/slub_def.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/include/linux/slub_def.h 2011-04-17 15:56:46.0000000= 00 -0400 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -51590,9 +49578,9 @@ diff -urNp linux-2.6.32.38/include/linux/slub_def= .h linux-2.6.32.38/include/linu void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.32.38/include/linux/sonet.h linux-2.6.32.38/include= /linux/sonet.h ---- linux-2.6.32.38/include/linux/sonet.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/sonet.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/sonet.h linux-2.6.32.39/include= /linux/sonet.h +--- linux-2.6.32.39/include/linux/sonet.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/sonet.h 2011-04-17 15:56:46.000000000 = -0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include =20 @@ -51602,9 +49590,9 @@ diff -urNp linux-2.6.32.38/include/linux/sonet.h = linux-2.6.32.38/include/linux/s __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.38/include/linux/sunrpc/clnt.h linux-2.6.32.38/i= nclude/linux/sunrpc/clnt.h ---- linux-2.6.32.38/include/linux/sunrpc/clnt.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/include/linux/sunrpc/clnt.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/include/linux/sunrpc/clnt.h linux-2.6.32.39/i= nclude/linux/sunrpc/clnt.h +--- linux-2.6.32.39/include/linux/sunrpc/clnt.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/include/linux/sunrpc/clnt.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por { switch (sap->sa_family) { @@ -51635,9 +49623,9 @@ diff -urNp linux-2.6.32.38/include/linux/sunrpc/c= lnt.h linux-2.6.32.38/include/l } =20 #endif /* __KERNEL__ */ -diff -urNp linux-2.6.32.38/include/linux/suspend.h linux-2.6.32.38/inclu= de/linux/suspend.h ---- linux-2.6.32.38/include/linux/suspend.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/linux/suspend.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/linux/suspend.h linux-2.6.32.39/inclu= de/linux/suspend.h +--- linux-2.6.32.39/include/linux/suspend.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/linux/suspend.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -51726,9 +49714,9 @@ diff -urNp linux-2.6.32.38/include/linux/suspend.= h linux-2.6.32.38/include/linux static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -diff -urNp linux-2.6.32.38/include/linux/sysctl.h linux-2.6.32.38/includ= e/linux/sysctl.h ---- linux-2.6.32.38/include/linux/sysctl.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/sysctl.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/sysctl.h linux-2.6.32.39/includ= e/linux/sysctl.h +--- linux-2.6.32.39/include/linux/sysctl.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/sysctl.h 2011-04-17 15:56:46.000000000= -0400 @@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=3D76, /* int: whether we will panic on an unrecovere= d */ }; @@ -51759,9 +49747,9 @@ diff -urNp linux-2.6.32.38/include/linux/sysctl.h= linux-2.6.32.38/include/linux/ extern ctl_handler sysctl_intvec; extern ctl_handler sysctl_jiffies; extern ctl_handler sysctl_ms_jiffies; -diff -urNp linux-2.6.32.38/include/linux/sysfs.h linux-2.6.32.38/include= /linux/sysfs.h ---- linux-2.6.32.38/include/linux/sysfs.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/sysfs.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/sysfs.h linux-2.6.32.39/include= /linux/sysfs.h +--- linux-2.6.32.39/include/linux/sysfs.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/sysfs.h 2011-04-17 15:56:46.000000000 = -0400 @@ -75,8 +75,8 @@ struct bin_attribute { }; =20 @@ -51773,9 +49761,9 @@ diff -urNp linux-2.6.32.38/include/linux/sysfs.h = linux-2.6.32.38/include/linux/s }; =20 struct sysfs_dirent; -diff -urNp linux-2.6.32.38/include/linux/thread_info.h linux-2.6.32.38/i= nclude/linux/thread_info.h ---- linux-2.6.32.38/include/linux/thread_info.h 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/include/linux/thread_info.h 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/include/linux/thread_info.h linux-2.6.32.39/i= nclude/linux/thread_info.h +--- linux-2.6.32.39/include/linux/thread_info.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/include/linux/thread_info.h 2011-04-17 15:56:46.0000= 00000 -0400 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait and futex_wait_requeue_pi */ @@ -51785,9 +49773,9 @@ diff -urNp linux-2.6.32.38/include/linux/thread_i= nfo.h linux-2.6.32.38/include/l u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.32.38/include/linux/tty.h linux-2.6.32.38/include/l= inux/tty.h ---- linux-2.6.32.38/include/linux/tty.h 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/include/linux/tty.h 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/include/linux/tty.h linux-2.6.32.39/include/l= inux/tty.h +--- linux-2.6.32.39/include/linux/tty.h 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/include/linux/tty.h 2011-04-17 15:56:46.000000000 -0= 400 @@ -13,6 +13,7 @@ #include #include @@ -51823,9 +49811,9 @@ diff -urNp linux-2.6.32.38/include/linux/tty.h li= nux-2.6.32.38/include/linux/tty =20 /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.32.38/include/linux/tty_ldisc.h linux-2.6.32.38/inc= lude/linux/tty_ldisc.h ---- linux-2.6.32.38/include/linux/tty_ldisc.h 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/include/linux/tty_ldisc.h 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/include/linux/tty_ldisc.h linux-2.6.32.39/inc= lude/linux/tty_ldisc.h +--- linux-2.6.32.39/include/linux/tty_ldisc.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/include/linux/tty_ldisc.h 2011-04-17 15:56:46.000000= 000 -0400 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { =20 struct module *owner; @@ -51835,9 +49823,9 @@ diff -urNp linux-2.6.32.38/include/linux/tty_ldis= c.h linux-2.6.32.38/include/lin }; =20 struct tty_ldisc { -diff -urNp linux-2.6.32.38/include/linux/types.h linux-2.6.32.38/include= /linux/types.h ---- linux-2.6.32.38/include/linux/types.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/linux/types.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/linux/types.h linux-2.6.32.39/include= /linux/types.h +--- linux-2.6.32.39/include/linux/types.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/linux/types.h 2011-04-17 15:56:46.000000000 = -0400 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -51865,9 +49853,9 @@ diff -urNp linux-2.6.32.38/include/linux/types.h = linux-2.6.32.38/include/linux/t #endif =20 struct ustat { -diff -urNp linux-2.6.32.38/include/linux/uaccess.h linux-2.6.32.38/inclu= de/linux/uaccess.h ---- linux-2.6.32.38/include/linux/uaccess.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/linux/uaccess.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/linux/uaccess.h linux-2.6.32.39/inclu= de/linux/uaccess.h +--- linux-2.6.32.39/include/linux/uaccess.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/linux/uaccess.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs =3D get_fs(); \ @@ -51899,9 +49887,9 @@ diff -urNp linux-2.6.32.38/include/linux/uaccess.= h linux-2.6.32.38/include/linux +extern long probe_kernel_write(void *dst, const void *src, size_t size)= ; =20 #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.32.38/include/linux/unaligned/access_ok.h linux-2.6= .32.38/include/linux/unaligned/access_ok.h ---- linux-2.6.32.38/include/linux/unaligned/access_ok.h 2011-03-27 14:31= :47.000000000 -0400 -+++ linux-2.6.32.38/include/linux/unaligned/access_ok.h 2011-04-17 15:56= :46.000000000 -0400 +diff -urNp linux-2.6.32.39/include/linux/unaligned/access_ok.h linux-2.6= .32.39/include/linux/unaligned/access_ok.h +--- linux-2.6.32.39/include/linux/unaligned/access_ok.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.39/include/linux/unaligned/access_ok.h 2011-04-17 15:56= :46.000000000 -0400 @@ -6,32 +6,32 @@ =20 static inline u16 get_unaligned_le16(const void *p) @@ -51941,9 +49929,9 @@ diff -urNp linux-2.6.32.38/include/linux/unaligne= d/access_ok.h linux-2.6.32.38/i } =20 static inline void put_unaligned_le16(u16 val, void *p) -diff -urNp linux-2.6.32.38/include/linux/vmalloc.h linux-2.6.32.38/inclu= de/linux/vmalloc.h ---- linux-2.6.32.38/include/linux/vmalloc.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/linux/vmalloc.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/linux/vmalloc.h linux-2.6.32.39/inclu= de/linux/vmalloc.h +--- linux-2.6.32.39/include/linux/vmalloc.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/linux/vmalloc.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining=20 #define VM_MAP 0x00000004 /* vmap()ed pages */ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ @@ -52038,9 +50026,9 @@ diff -urNp linux-2.6.32.38/include/linux/vmalloc.= h linux-2.6.32.38/include/linux +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.32.38/include/linux/vmstat.h linux-2.6.32.38/includ= e/linux/vmstat.h ---- linux-2.6.32.38/include/linux/vmstat.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/linux/vmstat.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/linux/vmstat.h linux-2.6.32.39/includ= e/linux/vmstat.h +--- linux-2.6.32.39/include/linux/vmstat.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/linux/vmstat.h 2011-04-17 15:56:46.000000000= -0400 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in /* * Zone based page accounting with per cpu differentials. @@ -52104,9 +50092,9 @@ diff -urNp linux-2.6.32.38/include/linux/vmstat.h= linux-2.6.32.38/include/linux/ } =20 static inline void __dec_zone_page_state(struct page *page, -diff -urNp linux-2.6.32.38/include/net/inetpeer.h linux-2.6.32.38/includ= e/net/inetpeer.h ---- linux-2.6.32.38/include/net/inetpeer.h 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/include/net/inetpeer.h 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/include/net/inetpeer.h linux-2.6.32.39/includ= e/net/inetpeer.h +--- linux-2.6.32.39/include/net/inetpeer.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/include/net/inetpeer.h 2011-04-17 15:56:46.000000000= -0400 @@ -24,7 +24,7 @@ struct inet_peer __u32 dtime; /* the time of last use of not * referenced entries */ @@ -52116,9 +50104,9 @@ diff -urNp linux-2.6.32.38/include/net/inetpeer.h= linux-2.6.32.38/include/net/in __u32 tcp_ts; unsigned long tcp_ts_stamp; }; -diff -urNp linux-2.6.32.38/include/net/irda/ircomm_tty.h linux-2.6.32.38= /include/net/irda/ircomm_tty.h ---- linux-2.6.32.38/include/net/irda/ircomm_tty.h 2011-03-27 14:31:47.00= 0000000 -0400 -+++ linux-2.6.32.38/include/net/irda/ircomm_tty.h 2011-04-17 15:56:46.00= 0000000 -0400 +diff -urNp linux-2.6.32.39/include/net/irda/ircomm_tty.h linux-2.6.32.39= /include/net/irda/ircomm_tty.h +--- linux-2.6.32.39/include/net/irda/ircomm_tty.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.39/include/net/irda/ircomm_tty.h 2011-04-17 15:56:46.00= 0000000 -0400 @@ -35,6 +35,7 @@ #include #include @@ -52138,9 +50126,9 @@ diff -urNp linux-2.6.32.38/include/net/irda/ircom= m_tty.h linux-2.6.32.38/include =20 /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.32.38/include/net/neighbour.h linux-2.6.32.38/inclu= de/net/neighbour.h ---- linux-2.6.32.38/include/net/neighbour.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/net/neighbour.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/net/neighbour.h linux-2.6.32.39/inclu= de/net/neighbour.h +--- linux-2.6.32.39/include/net/neighbour.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/net/neighbour.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -125,12 +125,12 @@ struct neighbour struct neigh_ops { @@ -52160,9 +50148,9 @@ diff -urNp linux-2.6.32.38/include/net/neighbour.= h linux-2.6.32.38/include/net/n }; =20 struct pneigh_entry -diff -urNp linux-2.6.32.38/include/net/netlink.h linux-2.6.32.38/include= /net/netlink.h ---- linux-2.6.32.38/include/net/netlink.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/include/net/netlink.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/include/net/netlink.h linux-2.6.32.39/include= /net/netlink.h +--- linux-2.6.32.39/include/net/netlink.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/include/net/netlink.h 2011-04-17 15:56:46.000000000 = -0400 @@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct static inline void nlmsg_trim(struct sk_buff *skb, const void *mark) { @@ -52172,9 +50160,9 @@ diff -urNp linux-2.6.32.38/include/net/netlink.h = linux-2.6.32.38/include/net/net } =20 /** -diff -urNp linux-2.6.32.38/include/net/sctp/sctp.h linux-2.6.32.38/inclu= de/net/sctp/sctp.h ---- linux-2.6.32.38/include/net/sctp/sctp.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/net/sctp/sctp.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/net/sctp/sctp.h linux-2.6.32.39/inclu= de/net/sctp/sctp.h +--- linux-2.6.32.39/include/net/sctp/sctp.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/net/sctp/sctp.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; =20 #else /* SCTP_DEBUG */ @@ -52186,9 +50174,9 @@ diff -urNp linux-2.6.32.38/include/net/sctp/sctp.= h linux-2.6.32.38/include/net/s #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.32.38/include/net/tcp.h linux-2.6.32.38/include/net= /tcp.h ---- linux-2.6.32.38/include/net/tcp.h 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/include/net/tcp.h 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/include/net/tcp.h linux-2.6.32.39/include/net= /tcp.h +--- linux-2.6.32.39/include/net/tcp.h 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/include/net/tcp.h 2011-04-17 15:56:46.000000000 -040= 0 @@ -1444,6 +1444,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -52197,9 +50185,9 @@ diff -urNp linux-2.6.32.38/include/net/tcp.h linu= x-2.6.32.38/include/net/tcp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.38/include/net/udp.h linux-2.6.32.38/include/net= /udp.h ---- linux-2.6.32.38/include/net/udp.h 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/include/net/udp.h 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/include/net/udp.h linux-2.6.32.39/include/net= /udp.h +--- linux-2.6.32.39/include/net/udp.h 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/include/net/udp.h 2011-04-17 15:56:46.000000000 -040= 0 @@ -187,6 +187,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -52208,9 +50196,9 @@ diff -urNp linux-2.6.32.38/include/net/udp.h linu= x-2.6.32.38/include/net/udp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.38/include/sound/ac97_codec.h linux-2.6.32.38/in= clude/sound/ac97_codec.h ---- linux-2.6.32.38/include/sound/ac97_codec.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/include/sound/ac97_codec.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/include/sound/ac97_codec.h linux-2.6.32.39/in= clude/sound/ac97_codec.h +--- linux-2.6.32.39/include/sound/ac97_codec.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/include/sound/ac97_codec.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -419,15 +419,15 @@ struct snd_ac97; =20 @@ -52243,9 +50231,9 @@ diff -urNp linux-2.6.32.38/include/sound/ac97_cod= ec.h linux-2.6.32.38/include/so void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ -diff -urNp linux-2.6.32.38/include/trace/events/irq.h linux-2.6.32.38/in= clude/trace/events/irq.h ---- linux-2.6.32.38/include/trace/events/irq.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/include/trace/events/irq.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/include/trace/events/irq.h linux-2.6.32.39/in= clude/trace/events/irq.h +--- linux-2.6.32.39/include/trace/events/irq.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/include/trace/events/irq.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -34,7 +34,7 @@ */ TRACE_EVENT(irq_handler_entry, @@ -52282,9 +50270,9 @@ diff -urNp linux-2.6.32.38/include/trace/events/i= rq.h linux-2.6.32.38/include/tr =20 TP_ARGS(h, vec), =20 -diff -urNp linux-2.6.32.38/include/video/uvesafb.h linux-2.6.32.38/inclu= de/video/uvesafb.h ---- linux-2.6.32.38/include/video/uvesafb.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/include/video/uvesafb.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/include/video/uvesafb.h linux-2.6.32.39/inclu= de/video/uvesafb.h +--- linux-2.6.32.39/include/video/uvesafb.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/include/video/uvesafb.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -52293,9 +50281,9 @@ diff -urNp linux-2.6.32.38/include/video/uvesafb.= h linux-2.6.32.38/include/video void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.32.38/init/do_mounts.c linux-2.6.32.38/init/do_moun= ts.c ---- linux-2.6.32.38/init/do_mounts.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/init/do_mounts.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/init/do_mounts.c linux-2.6.32.39/init/do_moun= ts.c +--- linux-2.6.32.39/init/do_mounts.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/init/do_mounts.c 2011-04-17 15:56:46.000000000 -0400 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa =20 static int __init do_mount_root(char *name, char *fs, int flags, void *= data) @@ -52341,9 +50329,9 @@ diff -urNp linux-2.6.32.38/init/do_mounts.c linux= -2.6.32.38/init/do_mounts.c + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL= , MS_MOVE, NULL); + sys_chroot((__force char __user *)"."); } -diff -urNp linux-2.6.32.38/init/do_mounts.h linux-2.6.32.38/init/do_moun= ts.h ---- linux-2.6.32.38/init/do_mounts.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/init/do_mounts.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/init/do_mounts.h linux-2.6.32.39/init/do_moun= ts.h +--- linux-2.6.32.39/init/do_mounts.h 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/init/do_mounts.h 2011-04-17 15:56:46.000000000 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; =20 static inline int create_dev(char *name, dev_t dev) @@ -52363,9 +50351,9 @@ diff -urNp linux-2.6.32.38/init/do_mounts.h linux= -2.6.32.38/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.32.38/init/do_mounts_initrd.c linux-2.6.32.38/init/= do_mounts_initrd.c ---- linux-2.6.32.38/init/do_mounts_initrd.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/init/do_mounts_initrd.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/init/do_mounts_initrd.c linux-2.6.32.39/init/= do_mounts_initrd.c +--- linux-2.6.32.39/init/do_mounts_initrd.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/init/do_mounts_initrd.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel sys_close(old_fd);sys_close(root_fd); sys_close(0);sys_close(1);sys_close(2); @@ -52449,9 +50437,9 @@ diff -urNp linux-2.6.32.38/init/do_mounts_initrd.= c linux-2.6.32.38/init/do_mount + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.32.38/init/do_mounts_md.c linux-2.6.32.38/init/do_m= ounts_md.c ---- linux-2.6.32.38/init/do_mounts_md.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/init/do_mounts_md.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/init/do_mounts_md.c linux-2.6.32.39/init/do_m= ounts_md.c +--- linux-2.6.32.39/init/do_mounts_md.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/init/do_mounts_md.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -52479,9 +50467,9 @@ diff -urNp linux-2.6.32.38/init/do_mounts_md.c li= nux-2.6.32.38/init/do_mounts_md if (fd >=3D 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.32.38/init/initramfs.c linux-2.6.32.38/init/initram= fs.c ---- linux-2.6.32.38/init/initramfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/init/initramfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/init/initramfs.c linux-2.6.32.39/init/initram= fs.c +--- linux-2.6.32.39/init/initramfs.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/init/initramfs.c 2011-04-17 15:56:46.000000000 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -52590,9 +50578,9 @@ diff -urNp linux-2.6.32.38/init/initramfs.c linux= -2.6.32.38/init/initramfs.c state =3D SkipIt; next_state =3D Reset; return 0; -diff -urNp linux-2.6.32.38/init/Kconfig linux-2.6.32.38/init/Kconfig ---- linux-2.6.32.38/init/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/init/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/init/Kconfig linux-2.6.32.39/init/Kconfig +--- linux-2.6.32.39/init/Kconfig 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/init/Kconfig 2011-04-17 15:56:46.000000000 -0400 @@ -1004,7 +1004,7 @@ config SLUB_DEBUG =20 config COMPAT_BRK @@ -52602,9 +50590,9 @@ diff -urNp linux-2.6.32.38/init/Kconfig linux-2.6= .32.38/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -diff -urNp linux-2.6.32.38/init/main.c linux-2.6.32.38/init/main.c ---- linux-2.6.32.38/init/main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/init/main.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/init/main.c linux-2.6.32.39/init/main.c +--- linux-2.6.32.39/init/main.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/init/main.c 2011-04-17 15:56:46.000000000 -0400 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)=20 #ifdef CONFIG_TC extern void tc_init(void); @@ -52746,9 +50734,9 @@ diff -urNp linux-2.6.32.38/init/main.c linux-2.6.= 32.38/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.32.38/init/noinitramfs.c linux-2.6.32.38/init/noini= tramfs.c ---- linux-2.6.32.38/init/noinitramfs.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/init/noinitramfs.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/init/noinitramfs.c linux-2.6.32.39/init/noini= tramfs.c +--- linux-2.6.32.39/init/noinitramfs.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/init/noinitramfs.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -52767,30 +50755,9 @@ diff -urNp linux-2.6.32.38/init/noinitramfs.c li= nux-2.6.32.38/init/noinitramfs.c if (err < 0) goto out; =20 -diff -urNp linux-2.6.32.38/ipc/ipc_sysctl.c linux-2.6.32.38/ipc/ipc_sysc= tl.c ---- linux-2.6.32.38/ipc/ipc_sysctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/ipc/ipc_sysctl.c 2011-04-17 15:56:46.000000000 -0400 -@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] - .extra1 =3D &zero, - .extra2 =3D &one, - }, -- {} -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static struct ctl_table ipc_root_table[] =3D { -@@ -277,7 +277,7 @@ static struct ctl_table ipc_root_table[] - .mode =3D 0555, - .child =3D ipc_kern_table, - }, -- {} -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.32.38/ipc/mqueue.c linux-2.6.32.38/ipc/mqueue.c ---- linux-2.6.32.38/ipc/mqueue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/ipc/mqueue.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/ipc/mqueue.c linux-2.6.32.39/ipc/mqueue.c +--- linux-2.6.32.39/ipc/mqueue.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/ipc/mqueue.c 2011-04-17 15:56:46.000000000 -0400 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st mq_bytes =3D (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -52799,9 +50766,9 @@ diff -urNp linux-2.6.32.38/ipc/mqueue.c linux-2.6= .32.38/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.32.38/ipc/shm.c linux-2.6.32.38/ipc/shm.c ---- linux-2.6.32.38/ipc/shm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/ipc/shm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/ipc/shm.c linux-2.6.32.39/ipc/shm.c +--- linux-2.6.32.39/ipc/shm.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/ipc/shm.c 2011-04-17 15:56:46.000000000 -0400 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -52854,9 +50821,9 @@ diff -urNp linux-2.6.32.38/ipc/shm.c linux-2.6.32= .38/ipc/shm.c size =3D i_size_read(path.dentry->d_inode); shm_unlock(shp); =20 -diff -urNp linux-2.6.32.38/kernel/acct.c linux-2.6.32.38/kernel/acct.c ---- linux-2.6.32.38/kernel/acct.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/acct.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/acct.c linux-2.6.32.39/kernel/acct.c +--- linux-2.6.32.39/kernel/acct.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/acct.c 2011-04-17 15:56:46.000000000 -0400 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a */ flim =3D current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -52866,9 +50833,9 @@ diff -urNp linux-2.6.32.38/kernel/acct.c linux-2.= 6.32.38/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur =3D flim; set_fs(fs); -diff -urNp linux-2.6.32.38/kernel/audit.c linux-2.6.32.38/kernel/audit.c ---- linux-2.6.32.38/kernel/audit.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/audit.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/audit.c linux-2.6.32.39/kernel/audit.c +--- linux-2.6.32.39/kernel/audit.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/audit.c 2011-04-17 15:56:46.000000000 -0400 @@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_b spin_unlock_irq(&tsk->sighand->siglock); } @@ -52882,9 +50849,9 @@ diff -urNp linux-2.6.32.38/kernel/audit.c linux-2= .6.32.38/kernel/audit.c break; } case AUDIT_TTY_SET: { -diff -urNp linux-2.6.32.38/kernel/capability.c linux-2.6.32.38/kernel/ca= pability.c ---- linux-2.6.32.38/kernel/capability.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/kernel/capability.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/kernel/capability.c linux-2.6.32.39/kernel/ca= pability.c +--- linux-2.6.32.39/kernel/capability.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/kernel/capability.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -305,10 +305,26 @@ int capable(int cap) BUG(); } @@ -52913,9 +50880,9 @@ diff -urNp linux-2.6.32.38/kernel/capability.c li= nux-2.6.32.38/kernel/capability + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.32.38/kernel/configs.c linux-2.6.32.38/kernel/confi= gs.c ---- linux-2.6.32.38/kernel/configs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/configs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/configs.c linux-2.6.32.39/kernel/confi= gs.c +--- linux-2.6.32.39/kernel/configs.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/configs.c 2011-04-17 15:56:46.000000000 -0400 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; =20 @@ -52936,9 +50903,9 @@ diff -urNp linux-2.6.32.38/kernel/configs.c linux= -2.6.32.38/kernel/configs.c if (!entry) return -ENOMEM; =20 -diff -urNp linux-2.6.32.38/kernel/cpu.c linux-2.6.32.38/kernel/cpu.c ---- linux-2.6.32.38/kernel/cpu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/cpu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/cpu.c linux-2.6.32.39/kernel/cpu.c +--- linux-2.6.32.39/kernel/cpu.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/cpu.c 2011-04-17 15:56:46.000000000 -0400 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -52948,9 +50915,9 @@ diff -urNp linux-2.6.32.38/kernel/cpu.c linux-2.6= .32.38/kernel/cpu.c =20 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.32.38/kernel/cred.c linux-2.6.32.38/kernel/cred.c ---- linux-2.6.32.38/kernel/cred.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/cred.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/cred.c linux-2.6.32.39/kernel/cred.c +--- linux-2.6.32.39/kernel/cred.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/cred.c 2011-04-17 15:56:46.000000000 -0400 @@ -544,6 +544,8 @@ int commit_creds(struct cred *new) =20 get_cred(new); /* we will require a ref for the subj creds too */ @@ -52960,9 +50927,9 @@ diff -urNp linux-2.6.32.38/kernel/cred.c linux-2.= 6.32.38/kernel/cred.c /* dumpability changes */ if (old->euid !=3D new->euid || old->egid !=3D new->egid || -diff -urNp linux-2.6.32.38/kernel/exit.c linux-2.6.32.38/kernel/exit.c ---- linux-2.6.32.38/kernel/exit.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/exit.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/exit.c linux-2.6.32.39/kernel/exit.c +--- linux-2.6.32.39/kernel/exit.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/exit.c 2011-04-17 15:56:46.000000000 -0400 @@ -55,6 +55,10 @@ #include #include @@ -53091,9 +51058,9 @@ diff -urNp linux-2.6.32.38/kernel/exit.c linux-2.= 6.32.38/kernel/exit.c =20 get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.32.38/kernel/fork.c linux-2.6.32.38/kernel/fork.c ---- linux-2.6.32.38/kernel/fork.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/fork.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/fork.c linux-2.6.32.39/kernel/fork.c +--- linux-2.6.32.39/kernel/fork.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/fork.c 2011-04-17 15:56:46.000000000 -0400 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend =3D STACK_END_MAGIC; /* for overflow detection */ =20 @@ -53232,9 +51199,9 @@ diff -urNp linux-2.6.32.38/kernel/fork.c linux-2.= 6.32.38/kernel/fork.c new_fs =3D NULL; else new_fs =3D fs; -diff -urNp linux-2.6.32.38/kernel/futex.c linux-2.6.32.38/kernel/futex.c ---- linux-2.6.32.38/kernel/futex.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/futex.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/futex.c linux-2.6.32.39/kernel/futex.c +--- linux-2.6.32.39/kernel/futex.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/futex.c 2011-04-17 15:56:46.000000000 -0400 @@ -54,6 +54,7 @@ #include #include @@ -53319,9 +51286,9 @@ diff -urNp linux-2.6.32.38/kernel/futex.c linux-2= .6.32.38/kernel/futex.c if (curval =3D=3D -EFAULT) futex_cmpxchg_enabled =3D 1; =20 -diff -urNp linux-2.6.32.38/kernel/futex_compat.c linux-2.6.32.38/kernel/= futex_compat.c ---- linux-2.6.32.38/kernel/futex_compat.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/kernel/futex_compat.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/kernel/futex_compat.c linux-2.6.32.39/kernel/= futex_compat.c +--- linux-2.6.32.39/kernel/futex_compat.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/kernel/futex_compat.c 2011-04-17 15:56:46.000000000 = -0400 @@ -10,6 +10,7 @@ #include #include @@ -53359,9 +51326,9 @@ diff -urNp linux-2.6.32.38/kernel/futex_compat.c = linux-2.6.32.38/kernel/futex_co head =3D p->compat_robust_list; read_unlock(&tasklist_lock); } -diff -urNp linux-2.6.32.38/kernel/gcov/base.c linux-2.6.32.38/kernel/gco= v/base.c ---- linux-2.6.32.38/kernel/gcov/base.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/kernel/gcov/base.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/kernel/gcov/base.c linux-2.6.32.39/kernel/gco= v/base.c +--- linux-2.6.32.39/kernel/gcov/base.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/kernel/gcov/base.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } =20 @@ -53383,9 +51350,9 @@ diff -urNp linux-2.6.32.38/kernel/gcov/base.c lin= ux-2.6.32.38/kernel/gcov/base.c if (prev) prev->next =3D info->next; else -diff -urNp linux-2.6.32.38/kernel/hrtimer.c linux-2.6.32.38/kernel/hrtim= er.c ---- linux-2.6.32.38/kernel/hrtimer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/hrtimer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/hrtimer.c linux-2.6.32.39/kernel/hrtim= er.c +--- linux-2.6.32.39/kernel/hrtimer.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/hrtimer.c 2011-04-17 15:56:46.000000000 -0400 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -53395,9 +51362,9 @@ diff -urNp linux-2.6.32.38/kernel/hrtimer.c linux= -2.6.32.38/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.32.38/kernel/kallsyms.c linux-2.6.32.38/kernel/kall= syms.c ---- linux-2.6.32.38/kernel/kallsyms.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/kernel/kallsyms.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/kernel/kallsyms.c linux-2.6.32.39/kernel/kall= syms.c +--- linux-2.6.32.39/kernel/kallsyms.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/kernel/kallsyms.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table = lookup" * compression (see scripts/kallsyms.c for a more complete descrip= tion) @@ -53500,9 +51467,9 @@ diff -urNp linux-2.6.32.38/kernel/kallsyms.c linu= x-2.6.32.38/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.32.38/kernel/kgdb.c linux-2.6.32.38/kernel/kgdb.c ---- linux-2.6.32.38/kernel/kgdb.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/kernel/kgdb.c 2011-04-17 17:03:58.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/kgdb.c linux-2.6.32.39/kernel/kgdb.c +--- linux-2.6.32.39/kernel/kgdb.c 2011-04-17 17:00:52.000000000 -0400 ++++ linux-2.6.32.39/kernel/kgdb.c 2011-04-17 17:03:58.000000000 -0400 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -53530,9 +51497,9 @@ diff -urNp linux-2.6.32.38/kernel/kgdb.c linux-2.= 6.32.38/kernel/kgdb.c { BUG_ON(kgdb_connected); =20 -diff -urNp linux-2.6.32.38/kernel/kmod.c linux-2.6.32.38/kernel/kmod.c ---- linux-2.6.32.38/kernel/kmod.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/kmod.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/kmod.c linux-2.6.32.39/kernel/kmod.c +--- linux-2.6.32.39/kernel/kmod.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/kmod.c 2011-04-17 15:56:46.000000000 -0400 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] =3D "/sb * If module auto-loading support is disabled then this function * becomes a no-operation. @@ -53626,9 +51593,9 @@ diff -urNp linux-2.6.32.38/kernel/kmod.c linux-2.= 6.32.38/kernel/kmod.c EXPORT_SYMBOL(__request_module); #endif /* CONFIG_MODULES */ =20 -diff -urNp linux-2.6.32.38/kernel/kprobes.c linux-2.6.32.38/kernel/kprob= es.c ---- linux-2.6.32.38/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/kprobes.c linux-2.6.32.39/kernel/kprob= es.c +--- linux-2.6.32.39/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. @@ -53665,9 +51632,9 @@ diff -urNp linux-2.6.32.38/kernel/kprobes.c linux= -2.6.32.38/kernel/kprobes.c =20 head =3D &kprobe_table[i]; preempt_disable(); -diff -urNp linux-2.6.32.38/kernel/lockdep.c linux-2.6.32.38/kernel/lockd= ep.c ---- linux-2.6.32.38/kernel/lockdep.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/lockdep.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/lockdep.c linux-2.6.32.39/kernel/lockd= ep.c +--- linux-2.6.32.39/kernel/lockdep.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/lockdep.c 2011-04-17 15:56:46.000000000 -0400 @@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t /* * Various lockdep statistics: @@ -53741,9 +51708,9 @@ diff -urNp linux-2.6.32.38/kernel/lockdep.c linux= -2.6.32.38/kernel/lockdep.c if (very_verbose(class)) { printk("\nacquire class [%p] %s", class->key, class->name); if (class->name_version > 1) -diff -urNp linux-2.6.32.38/kernel/lockdep_internals.h linux-2.6.32.38/ke= rnel/lockdep_internals.h ---- linux-2.6.32.38/kernel/lockdep_internals.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/kernel/lockdep_internals.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/kernel/lockdep_internals.h linux-2.6.32.39/ke= rnel/lockdep_internals.h +--- linux-2.6.32.39/kernel/lockdep_internals.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/kernel/lockdep_internals.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_ /* * Various lockdep statistics: @@ -53791,9 +51758,9 @@ diff -urNp linux-2.6.32.38/kernel/lockdep_interna= ls.h linux-2.6.32.38/kernel/loc #else # define debug_atomic_inc(ptr) do { } while (0) # define debug_atomic_dec(ptr) do { } while (0) -diff -urNp linux-2.6.32.38/kernel/lockdep_proc.c linux-2.6.32.38/kernel/= lockdep_proc.c ---- linux-2.6.32.38/kernel/lockdep_proc.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/kernel/lockdep_proc.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/kernel/lockdep_proc.c linux-2.6.32.39/kernel/= lockdep_proc.c +--- linux-2.6.32.39/kernel/lockdep_proc.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/kernel/lockdep_proc.c 2011-04-17 15:56:46.000000000 = -0400 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v =20 static void print_name(struct seq_file *m, struct lock_class *class) @@ -53803,9 +51770,9 @@ diff -urNp linux-2.6.32.38/kernel/lockdep_proc.c = linux-2.6.32.38/kernel/lockdep_ const char *name =3D class->name; =20 if (!name) { -diff -urNp linux-2.6.32.38/kernel/module.c linux-2.6.32.38/kernel/module= .c ---- linux-2.6.32.38/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/module.c 2011-04-19 06:33:26.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/module.c linux-2.6.32.39/kernel/module= .c +--- linux-2.6.32.39/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/module.c 2011-04-19 06:33:26.000000000 -0400 @@ -55,6 +55,7 @@ #include #include @@ -54439,9 +52406,9 @@ diff -urNp linux-2.6.32.38/kernel/module.c linux-= 2.6.32.38/kernel/module.c mod =3D NULL; } return mod; -diff -urNp linux-2.6.32.38/kernel/mutex.c linux-2.6.32.38/kernel/mutex.c ---- linux-2.6.32.38/kernel/mutex.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/mutex.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/mutex.c linux-2.6.32.39/kernel/mutex.c +--- linux-2.6.32.39/kernel/mutex.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/mutex.c 2011-04-17 15:56:46.000000000 -0400 @@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock,=20 */ =20 @@ -54479,9 +52446,9 @@ diff -urNp linux-2.6.32.38/kernel/mutex.c linux-2= .6.32.38/kernel/mutex.c mutex_set_owner(lock); =20 /* set it to 0 if there are no waiters left: */ -diff -urNp linux-2.6.32.38/kernel/mutex-debug.c linux-2.6.32.38/kernel/m= utex-debug.c ---- linux-2.6.32.38/kernel/mutex-debug.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/kernel/mutex-debug.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/kernel/mutex-debug.c linux-2.6.32.39/kernel/m= utex-debug.c +--- linux-2.6.32.39/kernel/mutex-debug.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/kernel/mutex-debug.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute } =20 @@ -54519,9 +52486,9 @@ diff -urNp linux-2.6.32.38/kernel/mutex-debug.c l= inux-2.6.32.38/kernel/mutex-deb DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); mutex_clear_owner(lock); } -diff -urNp linux-2.6.32.38/kernel/mutex-debug.h linux-2.6.32.38/kernel/m= utex-debug.h ---- linux-2.6.32.38/kernel/mutex-debug.h 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/kernel/mutex-debug.h 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/kernel/mutex-debug.h linux-2.6.32.39/kernel/m= utex-debug.h +--- linux-2.6.32.39/kernel/mutex-debug.h 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/kernel/mutex-debug.h 2011-04-17 15:56:46.000000000 -= 0400 @@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); extern void debug_mutex_add_waiter(struct mutex *lock, @@ -54542,9 +52509,9 @@ diff -urNp linux-2.6.32.38/kernel/mutex-debug.h l= inux-2.6.32.38/kernel/mutex-deb } =20 static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.32.38/kernel/mutex.h linux-2.6.32.38/kernel/mutex.h ---- linux-2.6.32.38/kernel/mutex.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/mutex.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/mutex.h linux-2.6.32.39/kernel/mutex.h +--- linux-2.6.32.39/kernel/mutex.h 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/mutex.h 2011-04-17 15:56:46.000000000 -0400 @@ -19,7 +19,7 @@ #ifdef CONFIG_SMP static inline void mutex_set_owner(struct mutex *lock) @@ -54554,9 +52521,9 @@ diff -urNp linux-2.6.32.38/kernel/mutex.h linux-2= .6.32.38/kernel/mutex.h } =20 static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.32.38/kernel/panic.c linux-2.6.32.38/kernel/panic.c ---- linux-2.6.32.38/kernel/panic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/panic.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/panic.c linux-2.6.32.39/kernel/panic.c +--- linux-2.6.32.39/kernel/panic.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/panic.c 2011-04-17 15:56:46.000000000 -0400 @@ -352,7 +352,7 @@ static void warn_slowpath_common(const c const char *board; =20 @@ -54576,9 +52543,9 @@ diff -urNp linux-2.6.32.38/kernel/panic.c linux-2= .6.32.38/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.32.38/kernel/params.c linux-2.6.32.38/kernel/params= .c ---- linux-2.6.32.38/kernel/params.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/params.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/params.c linux-2.6.32.39/kernel/params= .c +--- linux-2.6.32.39/kernel/params.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/params.c 2011-04-17 15:56:46.000000000 -0400 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct=20 return ret; } @@ -54597,9 +52564,9 @@ diff -urNp linux-2.6.32.38/kernel/params.c linux-= 2.6.32.38/kernel/params.c .filter =3D uevent_filter, }; =20 -diff -urNp linux-2.6.32.38/kernel/pid.c linux-2.6.32.38/kernel/pid.c ---- linux-2.6.32.38/kernel/pid.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/pid.c 2011-04-18 19:22:38.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/pid.c linux-2.6.32.39/kernel/pid.c +--- linux-2.6.32.39/kernel/pid.c 2011-04-22 19:16:29.000000000 -0400 ++++ linux-2.6.32.39/kernel/pid.c 2011-04-18 19:22:38.000000000 -0400 @@ -33,6 +33,7 @@ #include #include @@ -54617,23 +52584,7 @@ diff -urNp linux-2.6.32.38/kernel/pid.c linux-2.= 6.32.38/kernel/pid.c =20 int pid_max_min =3D RESERVED_PIDS + 1; int pid_max_max =3D PID_MAX_LIMIT; -@@ -182,11 +183,14 @@ static int alloc_pidmap(struct pid_names - return -1; - } -=20 --int next_pidmap(struct pid_namespace *pid_ns, int last) -+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last) - { - int offset; - struct pidmap *map, *end; -=20 -+ if (last >=3D PID_MAX_LIMIT) -+ return -1; -+ - offset =3D (last + 1) & BITS_PER_PAGE_MASK; - map =3D &pid_ns->pidmap[(last + 1)/BITS_PER_PAGE]; - end =3D &pid_ns->pidmap[PIDMAP_ENTRIES]; -@@ -380,7 +384,14 @@ EXPORT_SYMBOL(pid_task); +@@ -383,7 +384,14 @@ EXPORT_SYMBOL(pid_task); */ struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace = *ns) { @@ -54649,9 +52600,9 @@ diff -urNp linux-2.6.32.38/kernel/pid.c linux-2.6= .32.38/kernel/pid.c } =20 struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.32.38/kernel/posix-cpu-timers.c linux-2.6.32.38/ker= nel/posix-cpu-timers.c ---- linux-2.6.32.38/kernel/posix-cpu-timers.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/kernel/posix-cpu-timers.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/kernel/posix-cpu-timers.c linux-2.6.32.39/ker= nel/posix-cpu-timers.c +--- linux-2.6.32.39/kernel/posix-cpu-timers.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/kernel/posix-cpu-timers.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -6,6 +6,7 @@ #include #include @@ -54660,9 +52611,9 @@ diff -urNp linux-2.6.32.38/kernel/posix-cpu-timer= s.c linux-2.6.32.38/kernel/posi #include #include #include -diff -urNp linux-2.6.32.38/kernel/posix-timers.c linux-2.6.32.38/kernel/= posix-timers.c ---- linux-2.6.32.38/kernel/posix-timers.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/kernel/posix-timers.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/kernel/posix-timers.c linux-2.6.32.39/kernel/= posix-timers.c +--- linux-2.6.32.39/kernel/posix-timers.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/kernel/posix-timers.c 2011-04-17 15:56:46.000000000 = -0400 @@ -42,6 +42,7 @@ #include #include @@ -54685,9 +52636,9 @@ diff -urNp linux-2.6.32.38/kernel/posix-timers.c = linux-2.6.32.38/kernel/posix-ti return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp)); } =20 -diff -urNp linux-2.6.32.38/kernel/power/hibernate.c linux-2.6.32.38/kern= el/power/hibernate.c ---- linux-2.6.32.38/kernel/power/hibernate.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/kernel/power/hibernate.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/kernel/power/hibernate.c linux-2.6.32.39/kern= el/power/hibernate.c +--- linux-2.6.32.39/kernel/power/hibernate.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/kernel/power/hibernate.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -48,14 +48,14 @@ enum { =20 static int hibernation_mode =3D HIBERNATION_SHUTDOWN; @@ -54705,9 +52656,9 @@ diff -urNp linux-2.6.32.38/kernel/power/hibernate= .c linux-2.6.32.38/kernel/power { if (ops && !(ops->begin && ops->end && ops->pre_snapshot && ops->prepare && ops->finish && ops->enter && ops->pre_restore -diff -urNp linux-2.6.32.38/kernel/power/poweroff.c linux-2.6.32.38/kerne= l/power/poweroff.c ---- linux-2.6.32.38/kernel/power/poweroff.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/kernel/power/poweroff.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/kernel/power/poweroff.c linux-2.6.32.39/kerne= l/power/poweroff.c +--- linux-2.6.32.39/kernel/power/poweroff.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/kernel/power/poweroff.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask =3D SYSRQ_ENABLE_BOOT, }; @@ -54717,9 +52668,9 @@ diff -urNp linux-2.6.32.38/kernel/power/poweroff.= c linux-2.6.32.38/kernel/power/ { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.32.38/kernel/power/process.c linux-2.6.32.38/kernel= /power/process.c ---- linux-2.6.32.38/kernel/power/process.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/kernel/power/process.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/kernel/power/process.c linux-2.6.32.39/kernel= /power/process.c +--- linux-2.6.32.39/kernel/power/process.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/kernel/power/process.c 2011-04-17 15:56:46.000000000= -0400 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; u64 elapsed_csecs64; @@ -54759,9 +52710,9 @@ diff -urNp linux-2.6.32.38/kernel/power/process.c= linux-2.6.32.38/kernel/power/p =20 do_gettimeofday(&end); elapsed_csecs64 =3D timeval_to_ns(&end) - timeval_to_ns(&start); -diff -urNp linux-2.6.32.38/kernel/power/suspend.c linux-2.6.32.38/kernel= /power/suspend.c ---- linux-2.6.32.38/kernel/power/suspend.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/kernel/power/suspend.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/kernel/power/suspend.c linux-2.6.32.39/kernel= /power/suspend.c +--- linux-2.6.32.39/kernel/power/suspend.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/kernel/power/suspend.c 2011-04-17 15:56:46.000000000= -0400 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] =3D "mem", }; @@ -54778,9 +52729,9 @@ diff -urNp linux-2.6.32.38/kernel/power/suspend.c= linux-2.6.32.38/kernel/power/s { mutex_lock(&pm_mutex); suspend_ops =3D ops; -diff -urNp linux-2.6.32.38/kernel/printk.c linux-2.6.32.38/kernel/printk= .c ---- linux-2.6.32.38/kernel/printk.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/printk.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/printk.c linux-2.6.32.39/kernel/printk= .c +--- linux-2.6.32.39/kernel/printk.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/printk.c 2011-04-17 15:56:46.000000000 -0400 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; int error =3D 0; @@ -54793,9 +52744,9 @@ diff -urNp linux-2.6.32.38/kernel/printk.c linux-= 2.6.32.38/kernel/printk.c error =3D security_syslog(type); if (error) return error; -diff -urNp linux-2.6.32.38/kernel/ptrace.c linux-2.6.32.38/kernel/ptrace= .c ---- linux-2.6.32.38/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/ptrace.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/ptrace.c linux-2.6.32.39/kernel/ptrace= .c +--- linux-2.6.32.39/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/ptrace.c 2011-04-17 15:56:46.000000000 -0400 @@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru return ret; } @@ -54941,9 +52892,9 @@ diff -urNp linux-2.6.32.38/kernel/ptrace.c linux-= 2.6.32.38/kernel/ptrace.c goto out_put_task_struct; } =20 -diff -urNp linux-2.6.32.38/kernel/rcutree.c linux-2.6.32.38/kernel/rcutr= ee.c ---- linux-2.6.32.38/kernel/rcutree.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/rcutree.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/rcutree.c linux-2.6.32.39/kernel/rcutr= ee.c +--- linux-2.6.32.39/kernel/rcutree.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/rcutree.c 2011-04-17 15:56:46.000000000 -0400 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state /* * Do softirq processing for the current CPU. @@ -54953,9 +52904,9 @@ diff -urNp linux-2.6.32.38/kernel/rcutree.c linux= -2.6.32.38/kernel/rcutree.c { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.32.38/kernel/rcutree_plugin.h linux-2.6.32.38/kerne= l/rcutree_plugin.h ---- linux-2.6.32.38/kernel/rcutree_plugin.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/kernel/rcutree_plugin.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/kernel/rcutree_plugin.h linux-2.6.32.39/kerne= l/rcutree_plugin.h +--- linux-2.6.32.39/kernel/rcutree_plugin.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/kernel/rcutree_plugin.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi */ void __rcu_read_lock(void) @@ -54974,9 +52925,9 @@ diff -urNp linux-2.6.32.38/kernel/rcutree_plugin.= h linux-2.6.32.38/kernel/rcutre unlikely(ACCESS_ONCE(t->rcu_read_unlock_special))) rcu_read_unlock_special(t); } -diff -urNp linux-2.6.32.38/kernel/relay.c linux-2.6.32.38/kernel/relay.c ---- linux-2.6.32.38/kernel/relay.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/relay.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/relay.c linux-2.6.32.39/kernel/relay.c +--- linux-2.6.32.39/kernel/relay.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/relay.c 2011-04-17 15:56:46.000000000 -0400 @@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi unsigned int flags, int *nonpad_ret) @@ -54994,9 +52945,9 @@ diff -urNp linux-2.6.32.38/kernel/relay.c linux-2= .6.32.38/kernel/relay.c =20 if (rbuf->subbufs_produced =3D=3D rbuf->subbufs_consumed) return 0; -diff -urNp linux-2.6.32.38/kernel/resource.c linux-2.6.32.38/kernel/reso= urce.c ---- linux-2.6.32.38/kernel/resource.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/kernel/resource.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/kernel/resource.c linux-2.6.32.39/kernel/reso= urce.c +--- linux-2.6.32.39/kernel/resource.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/kernel/resource.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -132,8 +132,18 @@ static const struct file_operations proc =20 static int __init ioresources_init(void) @@ -55016,9 +52967,9 @@ diff -urNp linux-2.6.32.38/kernel/resource.c linu= x-2.6.32.38/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.32.38/kernel/rtmutex.c linux-2.6.32.38/kernel/rtmut= ex.c ---- linux-2.6.32.38/kernel/rtmutex.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/rtmutex.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/rtmutex.c linux-2.6.32.39/kernel/rtmut= ex.c +--- linux-2.6.32.39/kernel/rtmutex.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/rtmutex.c 2011-04-17 15:56:46.000000000 -0400 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt */ spin_lock_irqsave(&pendowner->pi_lock, flags); @@ -55028,9 +52979,9 @@ diff -urNp linux-2.6.32.38/kernel/rtmutex.c linux= -2.6.32.38/kernel/rtmutex.c WARN_ON(pendowner->pi_blocked_on !=3D waiter); WARN_ON(pendowner->pi_blocked_on->lock !=3D lock); =20 -diff -urNp linux-2.6.32.38/kernel/sched.c linux-2.6.32.38/kernel/sched.c ---- linux-2.6.32.38/kernel/sched.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/sched.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/sched.c linux-2.6.32.39/kernel/sched.c +--- linux-2.6.32.39/kernel/sched.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/sched.c 2011-04-23 12:56:11.000000000 -0400 @@ -5043,7 +5043,7 @@ out: * In CONFIG_NO_HZ case, the idle load balance owner will do the * rebalancing for all the cpus for whom scheduler ticks are stopped. @@ -55090,24 +53041,6 @@ diff -urNp linux-2.6.32.38/kernel/sched.c linux-= 2.6.32.38/kernel/sched.c return -EPERM; =20 retval =3D security_task_setnice(current, nice); -@@ -7700,7 +7703,7 @@ static struct ctl_table sd_ctl_dir[] =3D { - .procname =3D "sched_domain", - .mode =3D 0555, - }, -- {0, }, -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static struct ctl_table sd_ctl_root[] =3D { -@@ -7710,7 +7713,7 @@ static struct ctl_table sd_ctl_root[] =3D=20 - .mode =3D 0555, - .child =3D sd_ctl_dir, - }, -- {0, }, -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static struct ctl_table *sd_alloc_ctl_entry(int n) @@ -8774,7 +8777,7 @@ static void init_sched_groups_power(int=20 long power; int weight; @@ -55117,9 +53050,9 @@ diff -urNp linux-2.6.32.38/kernel/sched.c linux-2= .6.32.38/kernel/sched.c =20 if (cpu !=3D group_first_cpu(sd->groups)) return; -diff -urNp linux-2.6.32.38/kernel/signal.c linux-2.6.32.38/kernel/signal= .c ---- linux-2.6.32.38/kernel/signal.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/kernel/signal.c 2011-04-17 17:03:58.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/signal.c linux-2.6.32.39/kernel/signal= .c +--- linux-2.6.32.39/kernel/signal.c 2011-04-17 17:00:52.000000000 -0400 ++++ linux-2.6.32.39/kernel/signal.c 2011-04-17 17:03:58.000000000 -0400 @@ -41,12 +41,12 @@ =20 static struct kmem_cache *sigqueue_cachep; @@ -55222,9 +53155,9 @@ diff -urNp linux-2.6.32.38/kernel/signal.c linux-= 2.6.32.38/kernel/signal.c =20 return ret; } -diff -urNp linux-2.6.32.38/kernel/smp.c linux-2.6.32.38/kernel/smp.c ---- linux-2.6.32.38/kernel/smp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/smp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/smp.c linux-2.6.32.39/kernel/smp.c +--- linux-2.6.32.39/kernel/smp.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/smp.c 2011-04-17 15:56:46.000000000 -0400 @@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void=20 } EXPORT_SYMBOL(smp_call_function); @@ -55252,9 +53185,9 @@ diff -urNp linux-2.6.32.38/kernel/smp.c linux-2.6= .32.38/kernel/smp.c { spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.32.38/kernel/softirq.c linux-2.6.32.38/kernel/softi= rq.c ---- linux-2.6.32.38/kernel/softirq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/softirq.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/softirq.c linux-2.6.32.39/kernel/softi= rq.c +--- linux-2.6.32.39/kernel/softirq.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/softirq.c 2011-04-17 15:56:46.000000000 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec =20 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -55309,9 +53242,9 @@ diff -urNp linux-2.6.32.38/kernel/softirq.c linux= -2.6.32.38/kernel/softirq.c { struct tasklet_struct *list; =20 -diff -urNp linux-2.6.32.38/kernel/sys.c linux-2.6.32.38/kernel/sys.c ---- linux-2.6.32.38/kernel/sys.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/sys.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/sys.c linux-2.6.32.39/kernel/sys.c +--- linux-2.6.32.39/kernel/sys.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/sys.c 2011-04-17 15:56:46.000000000 -0400 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error =3D -EACCES; goto out; @@ -55447,9 +53380,9 @@ diff -urNp linux-2.6.32.38/kernel/sys.c linux-2.6= .32.38/kernel/sys.c error =3D -EINVAL; break; } -diff -urNp linux-2.6.32.38/kernel/sysctl.c linux-2.6.32.38/kernel/sysctl= .c ---- linux-2.6.32.38/kernel/sysctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/sysctl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/sysctl.c linux-2.6.32.39/kernel/sysctl= .c +--- linux-2.6.32.39/kernel/sysctl.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/sysctl.c 2011-04-17 15:56:46.000000000 -0400 @@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); =20 @@ -55681,9 +53614,9 @@ diff -urNp linux-2.6.32.38/kernel/sysctl.c linux-= 2.6.32.38/kernel/sysctl.c +EXPORT_SYMBOL(sysctl_string_modpriv); EXPORT_SYMBOL(sysctl_data); EXPORT_SYMBOL(unregister_sysctl_table); -diff -urNp linux-2.6.32.38/kernel/sysctl_check.c linux-2.6.32.38/kernel/= sysctl_check.c ---- linux-2.6.32.38/kernel/sysctl_check.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/kernel/sysctl_check.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/kernel/sysctl_check.c linux-2.6.32.39/kernel/= sysctl_check.c +--- linux-2.6.32.39/kernel/sysctl_check.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/kernel/sysctl_check.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n } else { if ((table->strategy =3D=3D sysctl_data) || @@ -55697,9 +53630,9 @@ diff -urNp linux-2.6.32.38/kernel/sysctl_check.c = linux-2.6.32.38/kernel/sysctl_c (table->proc_handler =3D=3D proc_dointvec) || (table->proc_handler =3D=3D proc_dointvec_minmax) || (table->proc_handler =3D=3D proc_dointvec_jiffies) || -diff -urNp linux-2.6.32.38/kernel/taskstats.c linux-2.6.32.38/kernel/tas= kstats.c ---- linux-2.6.32.38/kernel/taskstats.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/kernel/taskstats.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/kernel/taskstats.c linux-2.6.32.39/kernel/tas= kstats.c +--- linux-2.6.32.39/kernel/taskstats.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/kernel/taskstats.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -26,9 +26,12 @@ #include #include @@ -55723,9 +53656,9 @@ diff -urNp linux-2.6.32.38/kernel/taskstats.c lin= ux-2.6.32.38/kernel/taskstats.c if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; =20 -diff -urNp linux-2.6.32.38/kernel/time/tick-broadcast.c linux-2.6.32.38/= kernel/time/tick-broadcast.c ---- linux-2.6.32.38/kernel/time/tick-broadcast.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/kernel/time/tick-broadcast.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/kernel/time/tick-broadcast.c linux-2.6.32.39/= kernel/time/tick-broadcast.c +--- linux-2.6.32.39/kernel/time/tick-broadcast.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/kernel/time/tick-broadcast.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -55735,9 +53668,9 @@ diff -urNp linux-2.6.32.38/kernel/time/tick-broad= cast.c linux-2.6.32.38/kernel/t =20 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.32.38/kernel/time/timekeeping.c linux-2.6.32.38/ker= nel/time/timekeeping.c ---- linux-2.6.32.38/kernel/time/timekeeping.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/kernel/time/timekeeping.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/kernel/time/timekeeping.c linux-2.6.32.39/ker= nel/time/timekeeping.c +--- linux-2.6.32.39/kernel/time/timekeeping.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/kernel/time/timekeeping.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -14,6 +14,7 @@ #include #include @@ -55755,9 +53688,9 @@ diff -urNp linux-2.6.32.38/kernel/time/timekeepin= g.c linux-2.6.32.38/kernel/time write_seqlock_irqsave(&xtime_lock, flags); =20 timekeeping_forward_now(); -diff -urNp linux-2.6.32.38/kernel/time/timer_list.c linux-2.6.32.38/kern= el/time/timer_list.c ---- linux-2.6.32.38/kernel/time/timer_list.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/kernel/time/timer_list.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/kernel/time/timer_list.c linux-2.6.32.39/kern= el/time/timer_list.c +--- linux-2.6.32.39/kernel/time/timer_list.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/kernel/time/timer_list.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, =20 static void print_name_offset(struct seq_file *m, void *sym) @@ -55799,9 +53732,9 @@ diff -urNp linux-2.6.32.38/kernel/time/timer_list= .c linux-2.6.32.38/kernel/time/ if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.32.38/kernel/time/timer_stats.c linux-2.6.32.38/ker= nel/time/timer_stats.c ---- linux-2.6.32.38/kernel/time/timer_stats.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/kernel/time/timer_stats.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/kernel/time/timer_stats.c linux-2.6.32.39/ker= nel/time/timer_stats.c +--- linux-2.6.32.39/kernel/time/timer_stats.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/kernel/time/timer_stats.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time =20 static void print_name_offset(struct seq_file *m, unsigned long addr) @@ -55831,9 +53764,9 @@ diff -urNp linux-2.6.32.38/kernel/time/timer_stat= s.c linux-2.6.32.38/kernel/time if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.32.38/kernel/time.c linux-2.6.32.38/kernel/time.c ---- linux-2.6.32.38/kernel/time.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/time.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/time.c linux-2.6.32.39/kernel/time.c +--- linux-2.6.32.39/kernel/time.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/time.c 2011-04-17 15:56:46.000000000 -0400 @@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec=20 return error; =20 @@ -55864,9 +53797,9 @@ diff -urNp linux-2.6.32.38/kernel/time.c linux-2.= 6.32.38/kernel/time.c { #if HZ <=3D USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.32.38/kernel/timer.c linux-2.6.32.38/kernel/timer.c ---- linux-2.6.32.38/kernel/timer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/timer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/timer.c linux-2.6.32.39/kernel/timer.c +--- linux-2.6.32.39/kernel/timer.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/timer.c 2011-04-17 15:56:46.000000000 -0400 @@ -1213,7 +1213,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -55876,9 +53809,9 @@ diff -urNp linux-2.6.32.38/kernel/timer.c linux-2= .6.32.38/kernel/timer.c { struct tvec_base *base =3D __get_cpu_var(tvec_bases); =20 -diff -urNp linux-2.6.32.38/kernel/trace/ftrace.c linux-2.6.32.38/kernel/= trace/ftrace.c ---- linux-2.6.32.38/kernel/trace/ftrace.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/kernel/trace/ftrace.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/kernel/trace/ftrace.c linux-2.6.32.39/kernel/= trace/ftrace.c +--- linux-2.6.32.39/kernel/trace/ftrace.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/kernel/trace/ftrace.c 2011-04-17 15:56:46.000000000 = -0400 @@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod,=20 =20 ip =3D rec->ip; @@ -55900,9 +53833,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/ftrace.c = linux-2.6.32.38/kernel/trace/ft } =20 /* -diff -urNp linux-2.6.32.38/kernel/trace/ring_buffer.c linux-2.6.32.38/ke= rnel/trace/ring_buffer.c ---- linux-2.6.32.38/kernel/trace/ring_buffer.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/kernel/trace/ring_buffer.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/kernel/trace/ring_buffer.c linux-2.6.32.39/ke= rnel/trace/ring_buffer.c +--- linux-2.6.32.39/kernel/trace/ring_buffer.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/kernel/trace/ring_buffer.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st * the reader page). But if the next page is a header page, * its flags will be non zero. @@ -55912,9 +53845,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/ring_buff= er.c linux-2.6.32.38/kernel/tra rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *page, struct list_head *list) { -diff -urNp linux-2.6.32.38/kernel/trace/trace.c linux-2.6.32.38/kernel/t= race/trace.c ---- linux-2.6.32.38/kernel/trace/trace.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/kernel/trace/trace.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/kernel/trace/trace.c linux-2.6.32.39/kernel/t= race/trace.c +--- linux-2.6.32.39/kernel/trace/trace.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/kernel/trace/trace.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -3816,10 +3816,9 @@ static const struct file_operations trac }; #endif @@ -55939,9 +53872,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace.c l= inux-2.6.32.38/kernel/trace/tra static int once; struct dentry *d_tracer; =20 -diff -urNp linux-2.6.32.38/kernel/trace/trace_events.c linux-2.6.32.38/k= ernel/trace/trace_events.c ---- linux-2.6.32.38/kernel/trace/trace_events.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/kernel/trace/trace_events.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/kernel/trace/trace_events.c linux-2.6.32.39/k= ernel/trace/trace_events.c +--- linux-2.6.32.39/kernel/trace/trace_events.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/kernel/trace/trace_events.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list * Modules must own their file_operations to keep up with * reference counting. @@ -55951,9 +53884,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace_eve= nts.c linux-2.6.32.38/kernel/tr struct ftrace_module_file_ops { struct list_head list; struct module *mod; -diff -urNp linux-2.6.32.38/kernel/trace/trace_output.c linux-2.6.32.38/k= ernel/trace/trace_output.c ---- linux-2.6.32.38/kernel/trace/trace_output.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/kernel/trace/trace_output.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/kernel/trace/trace_output.c linux-2.6.32.39/k= ernel/trace/trace_output.c +--- linux-2.6.32.39/kernel/trace/trace_output.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/kernel/trace/trace_output.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,=20 return 0; p =3D d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -55963,9 +53896,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace_out= put.c linux-2.6.32.38/kernel/tr if (p) { s->len =3D p - s->buffer; return 1; -diff -urNp linux-2.6.32.38/kernel/trace/trace_stack.c linux-2.6.32.38/ke= rnel/trace/trace_stack.c ---- linux-2.6.32.38/kernel/trace/trace_stack.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/kernel/trace/trace_stack.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/kernel/trace/trace_stack.c linux-2.6.32.39/ke= rnel/trace/trace_stack.c +--- linux-2.6.32.39/kernel/trace/trace_stack.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/kernel/trace/trace_stack.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; =20 @@ -55975,9 +53908,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace_sta= ck.c linux-2.6.32.38/kernel/tra return; =20 local_irq_save(flags); -diff -urNp linux-2.6.32.38/kernel/trace/trace_workqueue.c linux-2.6.32.3= 8/kernel/trace/trace_workqueue.c ---- linux-2.6.32.38/kernel/trace/trace_workqueue.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/kernel/trace/trace_workqueue.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/kernel/trace/trace_workqueue.c linux-2.6.32.3= 9/kernel/trace/trace_workqueue.c +--- linux-2.6.32.39/kernel/trace/trace_workqueue.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/kernel/trace/trace_workqueue.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -21,7 +21,7 @@ struct cpu_workqueue_stats { int cpu; pid_t pid; @@ -56005,9 +53938,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace_wor= kqueue.c linux-2.6.32.38/kernel tsk->comm); put_task_struct(tsk); } -diff -urNp linux-2.6.32.38/kernel/user.c linux-2.6.32.38/kernel/user.c ---- linux-2.6.32.38/kernel/user.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/kernel/user.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/kernel/user.c linux-2.6.32.39/kernel/user.c +--- linux-2.6.32.39/kernel/user.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/kernel/user.c 2011-04-17 15:56:46.000000000 -0400 @@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use spin_lock_irq(&uidhash_lock); up =3D uid_hash_find(uid, hashent); @@ -56016,30 +53949,9 @@ diff -urNp linux-2.6.32.38/kernel/user.c linux-2= .6.32.38/kernel/user.c key_put(new->uid_keyring); key_put(new->session_keyring); kmem_cache_free(uid_cachep, new); -diff -urNp linux-2.6.32.38/kernel/utsname_sysctl.c linux-2.6.32.38/kerne= l/utsname_sysctl.c ---- linux-2.6.32.38/kernel/utsname_sysctl.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/kernel/utsname_sysctl.c 2011-04-17 15:56:46.00000000= 0 -0400 -@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] - .proc_handler =3D proc_do_uts_string, - .strategy =3D sysctl_uts_string, - }, -- {} -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static struct ctl_table uts_root_table[] =3D { -@@ -133,7 +133,7 @@ static struct ctl_table uts_root_table[] - .mode =3D 0555, - .child =3D uts_kern_table, - }, -- {} -+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } - }; -=20 - static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.32.38/lib/bug.c linux-2.6.32.38/lib/bug.c ---- linux-2.6.32.38/lib/bug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/bug.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/bug.c linux-2.6.32.39/lib/bug.c +--- linux-2.6.32.39/lib/bug.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/bug.c 2011-04-17 15:56:46.000000000 -0400 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; =20 @@ -56049,9 +53961,9 @@ diff -urNp linux-2.6.32.38/lib/bug.c linux-2.6.32= .38/lib/bug.c =20 printk(KERN_EMERG "------------[ cut here ]------------\n"); =20 -diff -urNp linux-2.6.32.38/lib/debugobjects.c linux-2.6.32.38/lib/debugo= bjects.c ---- linux-2.6.32.38/lib/debugobjects.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/lib/debugobjects.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/lib/debugobjects.c linux-2.6.32.39/lib/debugo= bjects.c +--- linux-2.6.32.39/lib/debugobjects.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/lib/debugobjects.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -56061,9 +53973,9 @@ diff -urNp linux-2.6.32.38/lib/debugobjects.c lin= ux-2.6.32.38/lib/debugobjects.c if (is_on_stack =3D=3D onstack) return; =20 -diff -urNp linux-2.6.32.38/lib/dma-debug.c linux-2.6.32.38/lib/dma-debug= .c ---- linux-2.6.32.38/lib/dma-debug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/dma-debug.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/dma-debug.c linux-2.6.32.39/lib/dma-debug= .c +--- linux-2.6.32.39/lib/dma-debug.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/dma-debug.c 2011-04-17 15:56:46.000000000 -0400 @@ -861,7 +861,7 @@ out: =20 static void check_for_stack(struct device *dev, void *addr) @@ -56073,9 +53985,9 @@ diff -urNp linux-2.6.32.38/lib/dma-debug.c linux-= 2.6.32.38/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=3D%p]\n", addr); } -diff -urNp linux-2.6.32.38/lib/idr.c linux-2.6.32.38/lib/idr.c ---- linux-2.6.32.38/lib/idr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/idr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/idr.c linux-2.6.32.39/lib/idr.c +--- linux-2.6.32.39/lib/idr.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/idr.c 2011-04-17 15:56:46.000000000 -0400 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in id =3D (id | ((1 << (IDR_BITS * l)) - 1)) + 1; =20 @@ -56085,9 +53997,9 @@ diff -urNp linux-2.6.32.38/lib/idr.c linux-2.6.32= .38/lib/idr.c *starting_id =3D id; return IDR_NEED_TO_GROW; } -diff -urNp linux-2.6.32.38/lib/inflate.c linux-2.6.32.38/lib/inflate.c ---- linux-2.6.32.38/lib/inflate.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/inflate.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/inflate.c linux-2.6.32.39/lib/inflate.c +--- linux-2.6.32.39/lib/inflate.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/inflate.c 2011-04-17 15:56:46.000000000 -0400 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr =3D free_mem_ptr; } @@ -56097,9 +54009,9 @@ diff -urNp linux-2.6.32.38/lib/inflate.c linux-2.= 6.32.38/lib/inflate.c #define free(a) kfree(a) #endif =20 -diff -urNp linux-2.6.32.38/lib/Kconfig.debug linux-2.6.32.38/lib/Kconfig= .debug ---- linux-2.6.32.38/lib/Kconfig.debug 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/lib/Kconfig.debug 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/lib/Kconfig.debug linux-2.6.32.39/lib/Kconfig= .debug +--- linux-2.6.32.39/lib/Kconfig.debug 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/lib/Kconfig.debug 2011-04-17 15:56:46.000000000 -040= 0 @@ -905,7 +905,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -56109,9 +54021,9 @@ diff -urNp linux-2.6.32.38/lib/Kconfig.debug linu= x-2.6.32.38/lib/Kconfig.debug help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. -diff -urNp linux-2.6.32.38/lib/kobject.c linux-2.6.32.38/lib/kobject.c ---- linux-2.6.32.38/lib/kobject.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/kobject.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/kobject.c linux-2.6.32.39/lib/kobject.c +--- linux-2.6.32.39/lib/kobject.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/kobject.c 2011-04-17 15:56:46.000000000 -0400 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -56139,9 +54051,9 @@ diff -urNp linux-2.6.32.38/lib/kobject.c linux-2.= 6.32.38/lib/kobject.c struct kobject *parent_kobj) { struct kset *kset; -diff -urNp linux-2.6.32.38/lib/kobject_uevent.c linux-2.6.32.38/lib/kobj= ect_uevent.c ---- linux-2.6.32.38/lib/kobject_uevent.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/lib/kobject_uevent.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/lib/kobject_uevent.c linux-2.6.32.39/lib/kobj= ect_uevent.c +--- linux-2.6.32.39/lib/kobject_uevent.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/lib/kobject_uevent.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; struct kobject *top_kobj; @@ -56151,9 +54063,9 @@ diff -urNp linux-2.6.32.38/lib/kobject_uevent.c l= inux-2.6.32.38/lib/kobject_ueve u64 seq; int i =3D 0; int retval =3D 0; -diff -urNp linux-2.6.32.38/lib/kref.c linux-2.6.32.38/lib/kref.c ---- linux-2.6.32.38/lib/kref.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/kref.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/kref.c linux-2.6.32.39/lib/kref.c +--- linux-2.6.32.39/lib/kref.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/kref.c 2011-04-17 15:56:46.000000000 -0400 @@ -61,7 +61,7 @@ void kref_get(struct kref *kref) */ int kref_put(struct kref *kref, void (*release)(struct kref *kref)) @@ -56163,9 +54075,9 @@ diff -urNp linux-2.6.32.38/lib/kref.c linux-2.6.3= 2.38/lib/kref.c WARN_ON(release =3D=3D (void (*)(struct kref *))kfree); =20 if (atomic_dec_and_test(&kref->refcount)) { -diff -urNp linux-2.6.32.38/lib/parser.c linux-2.6.32.38/lib/parser.c ---- linux-2.6.32.38/lib/parser.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/parser.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/parser.c linux-2.6.32.39/lib/parser.c +--- linux-2.6.32.39/lib/parser.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/parser.c 2011-04-17 15:56:46.000000000 -0400 @@ -126,7 +126,7 @@ static int match_number(substring_t *s,=20 char *buf; int ret; @@ -56175,9 +54087,9 @@ diff -urNp linux-2.6.32.38/lib/parser.c linux-2.6= .32.38/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.32.38/lib/radix-tree.c linux-2.6.32.38/lib/radix-tr= ee.c ---- linux-2.6.32.38/lib/radix-tree.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/radix-tree.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/radix-tree.c linux-2.6.32.39/lib/radix-tr= ee.c +--- linux-2.6.32.39/lib/radix-tree.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/radix-tree.c 2011-04-17 15:56:46.000000000 -0400 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -56187,9 +54099,9 @@ diff -urNp linux-2.6.32.38/lib/radix-tree.c linux= -2.6.32.38/lib/radix-tree.c =20 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.32.38/lib/random32.c linux-2.6.32.38/lib/random32.c ---- linux-2.6.32.38/lib/random32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/random32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/random32.c linux-2.6.32.39/lib/random32.c +--- linux-2.6.32.39/lib/random32.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/random32.c 2011-04-17 15:56:46.000000000 -0400 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -56199,9 +54111,9 @@ diff -urNp linux-2.6.32.38/lib/random32.c linux-2= .6.32.38/lib/random32.c } =20 /** -diff -urNp linux-2.6.32.38/lib/vsprintf.c linux-2.6.32.38/lib/vsprintf.c ---- linux-2.6.32.38/lib/vsprintf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/lib/vsprintf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/lib/vsprintf.c linux-2.6.32.39/lib/vsprintf.c +--- linux-2.6.32.39/lib/vsprintf.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/lib/vsprintf.c 2011-04-17 15:56:46.000000000 -0400 @@ -16,6 +16,9 @@ * - scnprintf and vscnprintf */ @@ -56302,26 +54214,34 @@ diff -urNp linux-2.6.32.38/lib/vsprintf.c linux= -2.6.32.38/lib/vsprintf.c break; } =20 -diff -urNp linux-2.6.32.38/localversion-grsec linux-2.6.32.38/localversi= on-grsec ---- linux-2.6.32.38/localversion-grsec 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.32.38/localversion-grsec 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/localversion-grsec linux-2.6.32.39/localversi= on-grsec +--- linux-2.6.32.39/localversion-grsec 1969-12-31 19:00:00.000000000 -05= 00 ++++ linux-2.6.32.39/localversion-grsec 2011-04-17 15:56:46.000000000 -04= 00 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.32.38/Makefile linux-2.6.32.38/Makefile ---- linux-2.6.32.38/Makefile 2011-04-17 17:00:57.000000000 -0400 -+++ linux-2.6.32.38/Makefile 2011-04-17 17:05:01.000000000 -0400 +diff -urNp linux-2.6.32.39/Makefile linux-2.6.32.39/Makefile +--- linux-2.6.32.39/Makefile 2011-04-22 19:16:29.000000000 -0400 ++++ linux-2.6.32.39/Makefile 2011-04-23 12:56:10.000000000 -0400 @@ -221,8 +221,8 @@ CONFIG_SHELL :=3D $(shell if [ -x "$$BASH" =20 HOSTCC =3D gcc HOSTCXX =3D g++ -HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fo= mit-frame-pointer -HOSTCXXFLAGS =3D -O2 -+HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 = -fomit-frame-pointer -fno-delete-null-pointer-checks ++HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-mi= ssing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointe= r-checks +HOSTCXXFLAGS =3D -O2 -fno-delete-null-pointer-checks =20 # Decide whether to build built-in, modular, or both. # Normally, just do built-in. -@@ -644,7 +644,7 @@ export mod_strip_cmd +@@ -342,6 +342,7 @@ LINUXINCLUDE :=3D -Iinclude \ + KBUILD_CPPFLAGS :=3D -D__KERNEL__ +=20 + KBUILD_CFLAGS :=3D -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ ++ -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initia= lizers \ + -fno-strict-aliasing -fno-common \ + -Werror-implicit-function-declaration \ + -Wno-format-security \ +@@ -644,7 +645,7 @@ export mod_strip_cmd =20 =20 ifeq ($(KBUILD_EXTMOD),) @@ -56330,9 +54250,9 @@ diff -urNp linux-2.6.32.38/Makefile linux-2.6.32.= 38/Makefile =20 vmlinux-dirs :=3D $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.32.38/mm/filemap.c linux-2.6.32.38/mm/filemap.c ---- linux-2.6.32.38/mm/filemap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/filemap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/filemap.c linux-2.6.32.39/mm/filemap.c +--- linux-2.6.32.39/mm/filemap.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/filemap.c 2011-04-17 15:56:46.000000000 -0400 @@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping =3D file->f_mapping; =20 @@ -56350,9 +54270,9 @@ diff -urNp linux-2.6.32.38/mm/filemap.c linux-2.6= .32.38/mm/filemap.c if (*pos >=3D limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.32.38/mm/fremap.c linux-2.6.32.38/mm/fremap.c ---- linux-2.6.32.38/mm/fremap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/fremap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/fremap.c linux-2.6.32.39/mm/fremap.c +--- linux-2.6.32.39/mm/fremap.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/fremap.c 2011-04-17 15:56:46.000000000 -0400 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma =3D find_vma(mm, start); @@ -56374,9 +54294,9 @@ diff -urNp linux-2.6.32.38/mm/fremap.c linux-2.6.= 32.38/mm/fremap.c munlock_vma_pages_range(vma, start, start + size); vma->vm_flags =3D saved_flags; } -diff -urNp linux-2.6.32.38/mm/highmem.c linux-2.6.32.38/mm/highmem.c ---- linux-2.6.32.38/mm/highmem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/highmem.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/highmem.c linux-2.6.32.39/mm/highmem.c +--- linux-2.6.32.39/mm/highmem.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/highmem.c 2011-04-17 15:56:46.000000000 -0400 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -56402,9 +54322,9 @@ diff -urNp linux-2.6.32.38/mm/highmem.c linux-2.6= .32.38/mm/highmem.c pkmap_count[last_pkmap_nr] =3D 1; set_page_address(page, (void *)vaddr); =20 -diff -urNp linux-2.6.32.38/mm/hugetlb.c linux-2.6.32.38/mm/hugetlb.c ---- linux-2.6.32.38/mm/hugetlb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/hugetlb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/hugetlb.c linux-2.6.32.39/mm/hugetlb.c +--- linux-2.6.32.39/mm/hugetlb.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/hugetlb.c 2011-04-17 15:56:46.000000000 -0400 @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -56484,9 +54404,9 @@ diff -urNp linux-2.6.32.38/mm/hugetlb.c linux-2.6= .32.38/mm/hugetlb.c ptep =3D huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.32.38/mm/Kconfig linux-2.6.32.38/mm/Kconfig ---- linux-2.6.32.38/mm/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/Kconfig linux-2.6.32.39/mm/Kconfig +--- linux-2.6.32.39/mm/Kconfig 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/Kconfig 2011-04-17 15:56:46.000000000 -0400 @@ -228,7 +228,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -56496,9 +54416,9 @@ diff -urNp linux-2.6.32.38/mm/Kconfig linux-2.6.3= 2.38/mm/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.38/mm/kmemleak.c linux-2.6.32.38/mm/kmemleak.c ---- linux-2.6.32.38/mm/kmemleak.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/kmemleak.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/kmemleak.c linux-2.6.32.39/mm/kmemleak.c +--- linux-2.6.32.39/mm/kmemleak.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/kmemleak.c 2011-04-17 15:56:46.000000000 -0400 @@ -358,7 +358,7 @@ static void print_unreferenced(struct se =20 for (i =3D 0; i < object->trace_len; i++) { @@ -56508,9 +54428,9 @@ diff -urNp linux-2.6.32.38/mm/kmemleak.c linux-2.= 6.32.38/mm/kmemleak.c } } =20 -diff -urNp linux-2.6.32.38/mm/maccess.c linux-2.6.32.38/mm/maccess.c ---- linux-2.6.32.38/mm/maccess.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/maccess.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/maccess.c linux-2.6.32.39/mm/maccess.c +--- linux-2.6.32.39/mm/maccess.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/maccess.c 2011-04-17 15:56:46.000000000 -0400 @@ -14,7 +14,7 @@ * Safely read from address @src to the buffer at @dst. If a kernel fa= ult * happens, handle that and return -EFAULT. @@ -56529,9 +54449,9 @@ diff -urNp linux-2.6.32.38/mm/maccess.c linux-2.6= .32.38/mm/maccess.c { long ret; mm_segment_t old_fs =3D get_fs(); -diff -urNp linux-2.6.32.38/mm/madvise.c linux-2.6.32.38/mm/madvise.c ---- linux-2.6.32.38/mm/madvise.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/madvise.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/madvise.c linux-2.6.32.39/mm/madvise.c +--- linux-2.6.32.39/mm/madvise.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/madvise.c 2011-04-17 15:56:46.000000000 -0400 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags =3D vma->vm_flags; @@ -56608,9 +54528,9 @@ diff -urNp linux-2.6.32.38/mm/madvise.c linux-2.6= .32.38/mm/madvise.c error =3D 0; if (end =3D=3D start) goto out; -diff -urNp linux-2.6.32.38/mm/memory.c linux-2.6.32.38/mm/memory.c ---- linux-2.6.32.38/mm/memory.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/memory.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/memory.c linux-2.6.32.39/mm/memory.c +--- linux-2.6.32.39/mm/memory.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/memory.c 2011-04-17 15:56:46.000000000 -0400 @@ -187,8 +187,12 @@ static inline void free_pmd_range(struct return; =20 @@ -57140,9 +55060,9 @@ diff -urNp linux-2.6.32.38/mm/memory.c linux-2.6.= 32.38/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.32.38/mm/memory-failure.c linux-2.6.32.38/mm/memory= -failure.c ---- linux-2.6.32.38/mm/memory-failure.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/mm/memory-failure.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/mm/memory-failure.c linux-2.6.32.39/mm/memory= -failure.c +--- linux-2.6.32.39/mm/memory-failure.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/mm/memory-failure.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r =20 int sysctl_memory_failure_recovery __read_mostly =3D 1; @@ -57161,9 +55081,9 @@ diff -urNp linux-2.6.32.38/mm/memory-failure.c li= nux-2.6.32.38/mm/memory-failure =20 /* * We need/can do nothing about count=3D0 pages. -diff -urNp linux-2.6.32.38/mm/mempolicy.c linux-2.6.32.38/mm/mempolicy.c ---- linux-2.6.32.38/mm/mempolicy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/mempolicy.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/mempolicy.c linux-2.6.32.39/mm/mempolicy.c +--- linux-2.6.32.39/mm/mempolicy.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/mempolicy.c 2011-04-17 15:56:46.000000000 -0400 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -57244,9 +55164,9 @@ diff -urNp linux-2.6.32.38/mm/mempolicy.c linux-2= .6.32.38/mm/mempolicy.c } else if (vma->vm_start <=3D mm->brk && vma->vm_end >=3D mm->start_br= k) { seq_printf(m, " heap"); } else if (vma->vm_start <=3D mm->start_stack && -diff -urNp linux-2.6.32.38/mm/migrate.c linux-2.6.32.38/mm/migrate.c ---- linux-2.6.32.38/mm/migrate.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/migrate.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/migrate.c linux-2.6.32.39/mm/migrate.c +--- linux-2.6.32.39/mm/migrate.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/migrate.c 2011-04-17 15:56:46.000000000 -0400 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,=20 if (!mm) return -EINVAL; @@ -57272,9 +55192,9 @@ diff -urNp linux-2.6.32.38/mm/migrate.c linux-2.6= .32.38/mm/migrate.c rcu_read_unlock(); err =3D -EPERM; goto out; -diff -urNp linux-2.6.32.38/mm/mlock.c linux-2.6.32.38/mm/mlock.c ---- linux-2.6.32.38/mm/mlock.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/mlock.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/mlock.c linux-2.6.32.39/mm/mlock.c +--- linux-2.6.32.39/mm/mlock.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/mlock.c 2011-04-17 15:56:46.000000000 -0400 @@ -13,6 +13,7 @@ #include #include @@ -57385,9 +55305,9 @@ diff -urNp linux-2.6.32.38/mm/mlock.c linux-2.6.3= 2.38/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <=3D lock_limit) = || capable(CAP_IPC_LOCK)) ret =3D do_mlockall(flags); -diff -urNp linux-2.6.32.38/mm/mmap.c linux-2.6.32.38/mm/mmap.c ---- linux-2.6.32.38/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/mmap.c linux-2.6.32.39/mm/mmap.c +--- linux-2.6.32.39/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -58604,9 +56524,9 @@ diff -urNp linux-2.6.32.38/mm/mmap.c linux-2.6.32= .38/mm/mmap.c vma->vm_flags =3D vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); =20 -diff -urNp linux-2.6.32.38/mm/mprotect.c linux-2.6.32.38/mm/mprotect.c ---- linux-2.6.32.38/mm/mprotect.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/mprotect.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/mprotect.c linux-2.6.32.39/mm/mprotect.c +--- linux-2.6.32.39/mm/mprotect.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/mprotect.c 2011-04-17 15:56:46.000000000 -0400 @@ -24,10 +24,16 @@ #include #include @@ -58829,9 +56749,9 @@ diff -urNp linux-2.6.32.38/mm/mprotect.c linux-2.= 6.32.38/mm/mprotect.c nstart =3D tmp; =20 if (nstart < prev->vm_end) -diff -urNp linux-2.6.32.38/mm/mremap.c linux-2.6.32.38/mm/mremap.c ---- linux-2.6.32.38/mm/mremap.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/mm/mremap.c 2011-04-17 17:03:58.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/mremap.c linux-2.6.32.39/mm/mremap.c +--- linux-2.6.32.39/mm/mremap.c 2011-04-17 17:00:52.000000000 -0400 ++++ linux-2.6.32.39/mm/mremap.c 2011-04-17 17:03:58.000000000 -0400 @@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str continue; pte =3D ptep_clear_flush(vma, old_addr, old_pte); @@ -58936,9 +56856,9 @@ diff -urNp linux-2.6.32.38/mm/mremap.c linux-2.6.= 32.38/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.32.38/mm/nommu.c linux-2.6.32.38/mm/nommu.c ---- linux-2.6.32.38/mm/nommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/nommu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/nommu.c linux-2.6.32.39/mm/nommu.c +--- linux-2.6.32.39/mm/nommu.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/nommu.c 2011-04-17 15:56:46.000000000 -0400 @@ -67,7 +67,6 @@ int sysctl_overcommit_memory =3D OVERCOMMI int sysctl_overcommit_ratio =3D 50; /* default is 50% */ int sysctl_max_map_count =3D DEFAULT_MAX_MAP_COUNT; @@ -58963,9 +56883,9 @@ diff -urNp linux-2.6.32.38/mm/nommu.c linux-2.6.3= 2.38/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.32.38/mm/page_alloc.c linux-2.6.32.38/mm/page_alloc= .c ---- linux-2.6.32.38/mm/page_alloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/page_alloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/page_alloc.c linux-2.6.32.39/mm/page_alloc= .c +--- linux-2.6.32.39/mm/page_alloc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/page_alloc.c 2011-04-17 15:56:46.000000000 -0400 @@ -587,6 +587,10 @@ static void __free_pages_ok(struct page=20 int bad =3D 0; int wasMlocked =3D __TestClearPageMlocked(page); @@ -59022,9 +56942,9 @@ diff -urNp linux-2.6.32.38/mm/page_alloc.c linux-= 2.6.32.38/mm/page_alloc.c struct zone *zone, unsigned long zonesize) {} #endif /* CONFIG_SPARSEMEM */ =20 -diff -urNp linux-2.6.32.38/mm/percpu.c linux-2.6.32.38/mm/percpu.c ---- linux-2.6.32.38/mm/percpu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/percpu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/percpu.c linux-2.6.32.39/mm/percpu.c +--- linux-2.6.32.39/mm/percpu.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/percpu.c 2011-04-17 15:56:46.000000000 -0400 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu=20 static unsigned int pcpu_last_unit_cpu __read_mostly; =20 @@ -59034,9 +56954,9 @@ diff -urNp linux-2.6.32.38/mm/percpu.c linux-2.6.= 32.38/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); =20 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.32.38/mm/rmap.c linux-2.6.32.38/mm/rmap.c ---- linux-2.6.32.38/mm/rmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/rmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/rmap.c linux-2.6.32.39/mm/rmap.c +--- linux-2.6.32.39/mm/rmap.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/rmap.c 2011-04-17 15:56:46.000000000 -0400 @@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru /* page_table_lock to protect against threads */ spin_lock(&mm->page_table_lock); @@ -59055,9 +56975,9 @@ diff -urNp linux-2.6.32.38/mm/rmap.c linux-2.6.32= .38/mm/rmap.c vma->anon_vma =3D anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated =3D NULL; -diff -urNp linux-2.6.32.38/mm/shmem.c linux-2.6.32.38/mm/shmem.c ---- linux-2.6.32.38/mm/shmem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/shmem.c 2011-04-18 22:03:00.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/shmem.c linux-2.6.32.39/mm/shmem.c +--- linux-2.6.32.39/mm/shmem.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/shmem.c 2011-04-18 22:03:00.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -59085,9 +57005,9 @@ diff -urNp linux-2.6.32.38/mm/shmem.c linux-2.6.3= 2.38/mm/shmem.c /* do it inline */ memcpy(info, symname, len); inode->i_op =3D &shmem_symlink_inline_operations; -diff -urNp linux-2.6.32.38/mm/slab.c linux-2.6.32.38/mm/slab.c ---- linux-2.6.32.38/mm/slab.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/slab.c 2011-04-18 22:08:34.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/slab.c linux-2.6.32.39/mm/slab.c +--- linux-2.6.32.39/mm/slab.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/slab.c 2011-04-23 12:56:11.000000000 -0400 @@ -174,7 +174,7 @@ =20 /* Legal flag mask for kmem_cache_create(). */ @@ -59124,24 +57044,6 @@ diff -urNp linux-2.6.32.38/mm/slab.c linux-2.6.3= 2.38/mm/slab.c { u32 offset =3D (obj - slab->s_mem); return reciprocal_divide(offset, cache->reciprocal_buffer_size); -@@ -584,14 +584,14 @@ struct cache_names { - static struct cache_names __initdata cache_names[] =3D { - #define CACHE(x) { .name =3D "size-" #x, .name_dma =3D "size-" #x "(DMA= )" }, - #include -- {NULL,} -+ {NULL, NULL} - #undef CACHE - }; -=20 - static struct arraycache_init initarray_cache __initdata =3D -- { {0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; -+ { {0, BOOT_CPUCACHE_ENTRIES, 1, 0}, {NULL} }; - static struct arraycache_init initarray_generic =3D -- { {0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; -+ { {0, BOOT_CPUCACHE_ENTRIES, 1, 0}, {NULL} }; -=20 - /* internal cache of cache description objs */ - static struct kmem_cache cache_cache =3D { @@ -1453,7 +1453,7 @@ void __init kmem_cache_init(void) sizes[INDEX_AC].cs_cachep =3D kmem_cache_create(names[INDEX_AC].name, sizes[INDEX_AC].cs_size, @@ -59238,9 +57140,9 @@ diff -urNp linux-2.6.32.38/mm/slab.c linux-2.6.32= .38/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.32.38/mm/slob.c linux-2.6.32.38/mm/slob.c ---- linux-2.6.32.38/mm/slob.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/slob.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/slob.c linux-2.6.32.39/mm/slob.c +--- linux-2.6.32.39/mm/slob.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/slob.c 2011-04-17 15:56:46.000000000 -0400 @@ -29,7 +29,7 @@ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls * alloc_pages() directly, allocating compound pages so the page order @@ -59558,9 +57460,9 @@ diff -urNp linux-2.6.32.38/mm/slob.c linux-2.6.32= .38/mm/slob.c } =20 trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.32.38/mm/slub.c linux-2.6.32.38/mm/slub.c ---- linux-2.6.32.38/mm/slub.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/slub.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/slub.c linux-2.6.32.39/mm/slub.c +--- linux-2.6.32.39/mm/slub.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/slub.c 2011-04-17 15:56:46.000000000 -0400 @@ -410,7 +410,7 @@ static void print_track(const char *s, s if (!t->addr) return; @@ -59771,9 +57673,9 @@ diff -urNp linux-2.6.32.38/mm/slub.c linux-2.6.32= .38/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.32.38/mm/util.c linux-2.6.32.38/mm/util.c ---- linux-2.6.32.38/mm/util.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/util.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/util.c linux-2.6.32.39/mm/util.c +--- linux-2.6.32.39/mm/util.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/util.c 2011-04-17 15:56:46.000000000 -0400 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -59787,9 +57689,9 @@ diff -urNp linux-2.6.32.38/mm/util.c linux-2.6.32= .38/mm/util.c mm->get_unmapped_area =3D arch_get_unmapped_area; mm->unmap_area =3D arch_unmap_area; } -diff -urNp linux-2.6.32.38/mm/vmalloc.c linux-2.6.32.38/mm/vmalloc.c ---- linux-2.6.32.38/mm/vmalloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/vmalloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/vmalloc.c linux-2.6.32.39/mm/vmalloc.c +--- linux-2.6.32.39/mm/vmalloc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/vmalloc.c 2011-04-17 15:56:46.000000000 -0400 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, =20 pte =3D pte_offset_kernel(pmd, addr); @@ -60026,9 +57928,9 @@ diff -urNp linux-2.6.32.38/mm/vmalloc.c linux-2.6= .32.38/mm/vmalloc.c if ((PAGE_SIZE-1) & (unsigned long)addr) return -EINVAL; =20 -diff -urNp linux-2.6.32.38/mm/vmstat.c linux-2.6.32.38/mm/vmstat.c ---- linux-2.6.32.38/mm/vmstat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/mm/vmstat.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/mm/vmstat.c linux-2.6.32.39/mm/vmstat.c +--- linux-2.6.32.39/mm/vmstat.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/mm/vmstat.c 2011-04-17 15:56:46.000000000 -0400 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -60081,9 +57983,9 @@ diff -urNp linux-2.6.32.38/mm/vmstat.c linux-2.6.= 32.38/mm/vmstat.c #endif return 0; } -diff -urNp linux-2.6.32.38/net/8021q/vlan.c linux-2.6.32.38/net/8021q/vl= an.c ---- linux-2.6.32.38/net/8021q/vlan.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/8021q/vlan.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/8021q/vlan.c linux-2.6.32.39/net/8021q/vl= an.c +--- linux-2.6.32.39/net/8021q/vlan.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/8021q/vlan.c 2011-04-17 15:56:46.000000000 -0400 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net err =3D -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -60094,9 +57996,9 @@ diff -urNp linux-2.6.32.38/net/8021q/vlan.c linux= -2.6.32.38/net/8021q/vlan.c struct vlan_net *vn; =20 vn =3D net_generic(net, vlan_net_id); -diff -urNp linux-2.6.32.38/net/atm/atm_misc.c linux-2.6.32.38/net/atm/at= m_misc.c ---- linux-2.6.32.38/net/atm/atm_misc.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/net/atm/atm_misc.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/net/atm/atm_misc.c linux-2.6.32.39/net/atm/at= m_misc.c +--- linux-2.6.32.39/net/atm/atm_misc.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/net/atm/atm_misc.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <=3D sk_atm(vcc)->sk_rcvb= uf) return 1; @@ -60133,9 +58035,9 @@ diff -urNp linux-2.6.32.38/net/atm/atm_misc.c lin= ux-2.6.32.38/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.38/net/atm/proc.c linux-2.6.32.38/net/atm/proc.c ---- linux-2.6.32.38/net/atm/proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/atm/proc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/atm/proc.c linux-2.6.32.39/net/atm/proc.c +--- linux-2.6.32.39/net/atm/proc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/atm/proc.c 2011-04-17 15:56:46.000000000 -0400 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -60174,9 +58076,9 @@ diff -urNp linux-2.6.32.38/net/atm/proc.c linux-2= .6.32.38/net/atm/proc.c else seq_printf(seq, "%3d %3d %5d ", vcc->dev->number, vcc->vpi, vcc->vci); -diff -urNp linux-2.6.32.38/net/atm/resources.c linux-2.6.32.38/net/atm/r= esources.c ---- linux-2.6.32.38/net/atm/resources.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/atm/resources.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/atm/resources.c linux-2.6.32.39/net/atm/r= esources.c +--- linux-2.6.32.39/net/atm/resources.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/atm/resources.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -60195,18 +58097,9 @@ diff -urNp linux-2.6.32.38/net/atm/resources.c l= inux-2.6.32.38/net/atm/resources __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.38/net/ax25/af_ax25.c linux-2.6.32.38/net/ax25/a= f_ax25.c ---- linux-2.6.32.38/net/ax25/af_ax25.c 2011-04-17 17:00:52.000000000 -04= 00 -+++ linux-2.6.32.38/net/ax25/af_ax25.c 2011-04-17 17:03:58.000000000 -04= 00 -@@ -1391,7 +1391,7 @@ static int ax25_getname(struct socket *s - ax25_cb *ax25; - int err =3D 0; -=20 -- memset(fsa, 0, sizeof(fsa)); -+ memset(fsa, 0, sizeof(*fsa)); - lock_sock(sk); - ax25 =3D ax25_sk(sk); -=20 +diff -urNp linux-2.6.32.39/net/ax25/af_ax25.c linux-2.6.32.39/net/ax25/a= f_ax25.c +--- linux-2.6.32.39/net/ax25/af_ax25.c 2011-04-22 19:16:29.000000000 -04= 00 ++++ linux-2.6.32.39/net/ax25/af_ax25.c 2011-04-17 17:03:58.000000000 -04= 00 @@ -1445,6 +1445,7 @@ static int ax25_sendmsg(struct kiocb *io if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT)) return -EINVAL; @@ -60215,9 +58108,9 @@ diff -urNp linux-2.6.32.38/net/ax25/af_ax25.c lin= ux-2.6.32.38/net/ax25/af_ax25.c lock_sock(sk); ax25 =3D ax25_sk(sk); =20 -diff -urNp linux-2.6.32.38/net/bridge/br_private.h linux-2.6.32.38/net/b= ridge/br_private.h ---- linux-2.6.32.38/net/bridge/br_private.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/net/bridge/br_private.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/net/bridge/br_private.h linux-2.6.32.39/net/b= ridge/br_private.h +--- linux-2.6.32.39/net/bridge/br_private.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/net/bridge/br_private.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,=20 =20 #ifdef CONFIG_SYSFS @@ -60227,9 +58120,9 @@ diff -urNp linux-2.6.32.38/net/bridge/br_private.= h linux-2.6.32.38/net/bridge/br extern int br_sysfs_addif(struct net_bridge_port *p); =20 /* br_sysfs_br.c */ -diff -urNp linux-2.6.32.38/net/bridge/br_stp_if.c linux-2.6.32.38/net/br= idge/br_stp_if.c ---- linux-2.6.32.38/net/bridge/br_stp_if.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/net/bridge/br_stp_if.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/net/bridge/br_stp_if.c linux-2.6.32.39/net/br= idge/br_stp_if.c +--- linux-2.6.32.39/net/bridge/br_stp_if.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/net/bridge/br_stp_if.c 2011-04-17 15:56:46.000000000= -0400 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] =3D { NULL }; =20 @@ -60239,9 +58132,9 @@ diff -urNp linux-2.6.32.38/net/bridge/br_stp_if.c= linux-2.6.32.38/net/bridge/br_ printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); =20 -diff -urNp linux-2.6.32.38/net/bridge/br_sysfs_if.c linux-2.6.32.38/net/= bridge/br_sysfs_if.c ---- linux-2.6.32.38/net/bridge/br_sysfs_if.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/net/bridge/br_sysfs_if.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/net/bridge/br_sysfs_if.c linux-2.6.32.39/net/= bridge/br_sysfs_if.c +--- linux-2.6.32.39/net/bridge/br_sysfs_if.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/net/bridge/br_sysfs_if.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -60251,9 +58144,9 @@ diff -urNp linux-2.6.32.38/net/bridge/br_sysfs_if= .c linux-2.6.32.38/net/bridge/b .show =3D brport_show, .store =3D brport_store, }; -diff -urNp linux-2.6.32.38/net/can/bcm.c linux-2.6.32.38/net/can/bcm.c ---- linux-2.6.32.38/net/can/bcm.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/net/can/bcm.c 2011-04-17 17:04:18.000000000 -0400 +diff -urNp linux-2.6.32.39/net/can/bcm.c linux-2.6.32.39/net/can/bcm.c +--- linux-2.6.32.39/net/can/bcm.c 2011-04-17 17:00:52.000000000 -0400 ++++ linux-2.6.32.39/net/can/bcm.c 2011-04-17 17:04:18.000000000 -0400 @@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file struct bcm_sock *bo =3D bcm_sk(sk); struct bcm_op *op; @@ -60270,9 +58163,27 @@ diff -urNp linux-2.6.32.38/net/can/bcm.c linux-2= .6.32.38/net/can/bcm.c seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs); seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex)); seq_printf(m, " <<<\n"); -diff -urNp linux-2.6.32.38/net/core/dev.c linux-2.6.32.38/net/core/dev.c ---- linux-2.6.32.38/net/core/dev.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.38/net/core/dev.c 2011-04-17 17:04:18.000000000 -0400 +diff -urNp linux-2.6.32.39/net/can/raw.c linux-2.6.32.39/net/can/raw.c +--- linux-2.6.32.39/net/can/raw.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/can/raw.c 2011-04-22 19:38:01.000000000 -0400 +@@ -280,7 +280,13 @@ static int raw_init(struct sock *sk) + static int raw_release(struct socket *sock) + { + struct sock *sk =3D sock->sk; +- struct raw_sock *ro =3D raw_sk(sk); ++ struct raw_sock *ro; ++ ++ ++ if (!sk) ++ return 0; ++ ++ ro =3D raw_sk(sk); +=20 + unregister_netdevice_notifier(&ro->notifier); +=20 +diff -urNp linux-2.6.32.39/net/core/dev.c linux-2.6.32.39/net/core/dev.c +--- linux-2.6.32.39/net/core/dev.c 2011-04-17 17:00:52.000000000 -0400 ++++ linux-2.6.32.39/net/core/dev.c 2011-04-17 17:04:18.000000000 -0400 @@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const cha if (no_module && capable(CAP_NET_ADMIN)) no_module =3D request_module("netdev-%s", name); @@ -60306,9 +58217,9 @@ diff -urNp linux-2.6.32.38/net/core/dev.c linux-2= .6.32.38/net/core/dev.c { struct list_head *list =3D &__get_cpu_var(softnet_data).poll_list; unsigned long time_limit =3D jiffies + 2; -diff -urNp linux-2.6.32.38/net/core/flow.c linux-2.6.32.38/net/core/flow= .c ---- linux-2.6.32.38/net/core/flow.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/core/flow.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/core/flow.c linux-2.6.32.39/net/core/flow= .c +--- linux-2.6.32.39/net/core/flow.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/core/flow.c 2011-04-17 15:56:46.000000000 -0400 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid =3D ATOMIC_INIT( =20 static u32 flow_hash_shift; @@ -60336,10 +58247,10 @@ diff -urNp linux-2.6.32.38/net/core/flow.c linu= x-2.6.32.38/net/core/flow.c =20 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) =20 -diff -urNp linux-2.6.32.38/net/core/sock.c linux-2.6.32.38/net/core/sock= .c ---- linux-2.6.32.38/net/core/sock.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/core/sock.c 2011-04-19 17:30:07.000000000 -0400 -@@ -864,12 +864,15 @@ int sock_getsockopt(struct socket *sock, +diff -urNp linux-2.6.32.39/net/core/sock.c linux-2.6.32.39/net/core/sock= .c +--- linux-2.6.32.39/net/core/sock.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/core/sock.c 2011-04-23 13:45:37.000000000 -0400 +@@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock, break; =20 case SO_PEERCRED: @@ -60352,42 +58263,13 @@ diff -urNp linux-2.6.32.38/net/core/sock.c linu= x-2.6.32.38/net/core/sock.c + if (copy_to_user(optval, &peercred, len)) return -EFAULT; goto lenout; -- + } +=20 case SO_PEERNAME: { - char address[128]; -diff -urNp linux-2.6.32.38/net/dccp/ccids/ccid3.c linux-2.6.32.38/net/dc= cp/ccids/ccid3.c ---- linux-2.6.32.38/net/dccp/ccids/ccid3.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/net/dccp/ccids/ccid3.c 2011-04-17 15:56:46.000000000= -0400 -@@ -41,7 +41,7 @@ - static int ccid3_debug; - #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format,= ##a) - #else --#define ccid3_pr_debug(format, a...) -+#define ccid3_pr_debug(format, a...) do {} while (0) - #endif -=20 - /* -diff -urNp linux-2.6.32.38/net/dccp/dccp.h linux-2.6.32.38/net/dccp/dccp= .h ---- linux-2.6.32.38/net/dccp/dccp.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/dccp/dccp.h 2011-04-17 15:56:46.000000000 -0400 -@@ -44,9 +44,9 @@ extern int dccp_debug; - #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, forma= t, ##a) - #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) - #else --#define dccp_pr_debug(format, a...) --#define dccp_pr_debug_cat(format, a...) --#define dccp_debug(format, a...) -+#define dccp_pr_debug(format, a...) do {} while (0) -+#define dccp_pr_debug_cat(format, a...) do {} while (0) -+#define dccp_debug(format, a...) do {} while (0) - #endif -=20 - extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.32.38/net/decnet/sysctl_net_decnet.c linux-2.6.32.3= 8/net/decnet/sysctl_net_decnet.c ---- linux-2.6.32.38/net/decnet/sysctl_net_decnet.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/net/decnet/sysctl_net_decnet.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/net/decnet/sysctl_net_decnet.c linux-2.6.32.3= 9/net/decnet/sysctl_net_decnet.c +--- linux-2.6.32.39/net/decnet/sysctl_net_decnet.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/net/decnet/sysctl_net_decnet.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t =20 if (len > *lenp) len =3D *lenp; @@ -60406,9 +58288,9 @@ diff -urNp linux-2.6.32.38/net/decnet/sysctl_net_= decnet.c linux-2.6.32.38/net/de return -EFAULT; =20 *lenp =3D len; -diff -urNp linux-2.6.32.38/net/econet/Kconfig linux-2.6.32.38/net/econet= /Kconfig ---- linux-2.6.32.38/net/econet/Kconfig 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/net/econet/Kconfig 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/net/econet/Kconfig linux-2.6.32.39/net/econet= /Kconfig +--- linux-2.6.32.39/net/econet/Kconfig 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/net/econet/Kconfig 2011-04-17 15:56:46.000000000 -04= 00 @@ -4,7 +4,7 @@ =20 config ECONET @@ -60418,9 +58300,9 @@ diff -urNp linux-2.6.32.38/net/econet/Kconfig lin= ux-2.6.32.38/net/econet/Kconfig ---help--- Econet is a fairly old and slow networking protocol mainly used by Acorn computers to access file and print servers. It uses native -diff -urNp linux-2.6.32.38/net/ipv4/inet_diag.c linux-2.6.32.38/net/ipv4= /inet_diag.c ---- linux-2.6.32.38/net/ipv4/inet_diag.c 2011-04-17 17:00:52.000000000 -= 0400 -+++ linux-2.6.32.38/net/ipv4/inet_diag.c 2011-04-17 17:04:18.000000000 -= 0400 +diff -urNp linux-2.6.32.39/net/ipv4/inet_diag.c linux-2.6.32.39/net/ipv4= /inet_diag.c +--- linux-2.6.32.39/net/ipv4/inet_diag.c 2011-04-17 17:00:52.000000000 -= 0400 ++++ linux-2.6.32.39/net/ipv4/inet_diag.c 2011-04-17 17:04:18.000000000 -= 0400 @@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc r->idiag_retrans =3D 0; =20 @@ -60481,9 +58363,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/inet_diag.c l= inux-2.6.32.38/net/ipv4/inet_di =20 tmo =3D req->expires - jiffies; if (tmo < 0) -diff -urNp linux-2.6.32.38/net/ipv4/inet_hashtables.c linux-2.6.32.38/ne= t/ipv4/inet_hashtables.c ---- linux-2.6.32.38/net/ipv4/inet_hashtables.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/net/ipv4/inet_hashtables.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/net/ipv4/inet_hashtables.c linux-2.6.32.39/ne= t/ipv4/inet_hashtables.c +--- linux-2.6.32.39/net/ipv4/inet_hashtables.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/net/ipv4/inet_hashtables.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -18,11 +18,14 @@ #include #include @@ -60508,9 +58390,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/inet_hashtabl= es.c linux-2.6.32.38/net/ipv4/i if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.32.38/net/ipv4/inetpeer.c linux-2.6.32.38/net/ipv4/= inetpeer.c ---- linux-2.6.32.38/net/ipv4/inetpeer.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/ipv4/inetpeer.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/ipv4/inetpeer.c linux-2.6.32.39/net/ipv4/= inetpeer.c +--- linux-2.6.32.39/net/ipv4/inetpeer.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/ipv4/inetpeer.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -389,7 +389,7 @@ struct inet_peer *inet_getpeer(__be32 da return NULL; n->v4daddr =3D daddr; @@ -60520,9 +58402,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/inetpeer.c li= nux-2.6.32.38/net/ipv4/inetpeer n->ip_id_count =3D secure_ip_id(daddr); n->tcp_ts_stamp =3D 0; =20 -diff -urNp linux-2.6.32.38/net/ipv4/ip_fragment.c linux-2.6.32.38/net/ip= v4/ip_fragment.c ---- linux-2.6.32.38/net/ipv4/ip_fragment.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/net/ipv4/ip_fragment.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/net/ipv4/ip_fragment.c linux-2.6.32.39/net/ip= v4/ip_fragment.c +--- linux-2.6.32.39/net/ipv4/ip_fragment.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/net/ipv4/ip_fragment.c 2011-04-17 15:56:46.000000000= -0400 @@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct return 0; =20 @@ -60532,9 +58414,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/ip_fragment.c= linux-2.6.32.38/net/ipv4/ip_fr qp->rid =3D end; =20 rc =3D qp->q.fragments && (end - start) > max; -diff -urNp linux-2.6.32.38/net/ipv4/netfilter/arp_tables.c linux-2.6.32.= 38/net/ipv4/netfilter/arp_tables.c ---- linux-2.6.32.38/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:00:52.= 000000000 -0400 -+++ linux-2.6.32.38/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:04:18.= 000000000 -0400 +diff -urNp linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c linux-2.6.32.= 39/net/ipv4/netfilter/arp_tables.c +--- linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:00:52.= 000000000 -0400 ++++ linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:04:18.= 000000000 -0400 @@ -934,6 +934,7 @@ static int get_info(struct net *net, voi private =3D &tmp; } @@ -60543,9 +58425,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/netfilter/arp= _tables.c linux-2.6.32.38/net/i info.valid_hooks =3D t->valid_hooks; memcpy(info.hook_entry, private->hook_entry, sizeof(info.hook_entry)); -diff -urNp linux-2.6.32.38/net/ipv4/netfilter/ip_tables.c linux-2.6.32.3= 8/net/ipv4/netfilter/ip_tables.c ---- linux-2.6.32.38/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:00:52.0= 00000000 -0400 -+++ linux-2.6.32.38/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:04:18.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c linux-2.6.32.3= 9/net/ipv4/netfilter/ip_tables.c +--- linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:00:52.0= 00000000 -0400 ++++ linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:04:18.0= 00000000 -0400 @@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi private =3D &tmp; } @@ -60554,9 +58436,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/netfilter/ip_= tables.c linux-2.6.32.38/net/ip info.valid_hooks =3D t->valid_hooks; memcpy(info.hook_entry, private->hook_entry, sizeof(info.hook_entry)); -diff -urNp linux-2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-= 2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-27 14= :31:47.000000000 -0400 -+++ linux-2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15= :56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-= 2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15= :56:46.000000000 -0400 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( =20 *len =3D 0; @@ -60566,9 +58448,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/netfilter/nf_= nat_snmp_basic.c linux-2.6.32.3 if (*octets =3D=3D NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.32.38/net/ipv4/raw.c linux-2.6.32.38/net/ipv4/raw.c ---- linux-2.6.32.38/net/ipv4/raw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/ipv4/raw.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/ipv4/raw.c linux-2.6.32.39/net/ipv4/raw.c +--- linux-2.6.32.39/net/ipv4/raw.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/ipv4/raw.c 2011-04-17 15:56:46.000000000 -0400 @@ -724,15 +724,22 @@ static int raw_init(struct sock *sk) =20 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int = optlen) @@ -60604,9 +58486,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/raw.c linux-2= .6.32.38/net/ipv4/raw.c goto out; ret =3D 0; out: return ret; -diff -urNp linux-2.6.32.38/net/ipv4/tcp_ipv4.c linux-2.6.32.38/net/ipv4/= tcp_ipv4.c ---- linux-2.6.32.38/net/ipv4/tcp_ipv4.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/ipv4/tcp_ipv4.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/ipv4/tcp_ipv4.c linux-2.6.32.39/net/ipv4/= tcp_ipv4.c +--- linux-2.6.32.39/net/ipv4/tcp_ipv4.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/ipv4/tcp_ipv4.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -84,6 +84,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; @@ -60702,9 +58584,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/tcp_ipv4.c li= nux-2.6.32.38/net/ipv4/tcp_ipv4 } =20 #define TMPSZ 150 -diff -urNp linux-2.6.32.38/net/ipv4/tcp_minisocks.c linux-2.6.32.38/net/= ipv4/tcp_minisocks.c ---- linux-2.6.32.38/net/ipv4/tcp_minisocks.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/net/ipv4/tcp_minisocks.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/net/ipv4/tcp_minisocks.c linux-2.6.32.39/net/= ipv4/tcp_minisocks.c +--- linux-2.6.32.39/net/ipv4/tcp_minisocks.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/net/ipv4/tcp_minisocks.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -26,6 +26,10 @@ #include #include @@ -60727,9 +58609,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/tcp_minisocks= .c linux-2.6.32.38/net/ipv4/tcp if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); =20 -diff -urNp linux-2.6.32.38/net/ipv4/tcp_probe.c linux-2.6.32.38/net/ipv4= /tcp_probe.c ---- linux-2.6.32.38/net/ipv4/tcp_probe.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/net/ipv4/tcp_probe.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/net/ipv4/tcp_probe.c linux-2.6.32.39/net/ipv4= /tcp_probe.c +--- linux-2.6.32.39/net/ipv4/tcp_probe.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/net/ipv4/tcp_probe.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >=3D len) break; @@ -60739,9 +58621,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/tcp_probe.c l= inux-2.6.32.38/net/ipv4/tcp_pro return -EFAULT; cnt +=3D width; } -diff -urNp linux-2.6.32.38/net/ipv4/tcp_timer.c linux-2.6.32.38/net/ipv4= /tcp_timer.c ---- linux-2.6.32.38/net/ipv4/tcp_timer.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/net/ipv4/tcp_timer.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/net/ipv4/tcp_timer.c linux-2.6.32.39/net/ipv4= /tcp_timer.c +--- linux-2.6.32.39/net/ipv4/tcp_timer.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/net/ipv4/tcp_timer.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -21,6 +21,10 @@ #include #include @@ -60767,9 +58649,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/tcp_timer.c l= inux-2.6.32.38/net/ipv4/tcp_tim if (retransmits_timed_out(sk, retry_until)) { /* Has it gone just too far? */ tcp_write_err(sk); -diff -urNp linux-2.6.32.38/net/ipv4/udp.c linux-2.6.32.38/net/ipv4/udp.c ---- linux-2.6.32.38/net/ipv4/udp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/ipv4/udp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/ipv4/udp.c linux-2.6.32.39/net/ipv4/udp.c +--- linux-2.6.32.39/net/ipv4/udp.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/ipv4/udp.c 2011-04-17 15:56:46.000000000 -0400 @@ -86,6 +86,7 @@ #include #include @@ -60853,21 +58735,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/udp.c linux-= 2.6.32.38/net/ipv4/udp.c atomic_read(&sp->sk_drops), len); } =20 -diff -urNp linux-2.6.32.38/net/ipv6/exthdrs.c linux-2.6.32.38/net/ipv6/e= xthdrs.c ---- linux-2.6.32.38/net/ipv6/exthdrs.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/net/ipv6/exthdrs.c 2011-04-17 15:56:46.000000000 -04= 00 -@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt - .type =3D IPV6_TLV_JUMBO, - .func =3D ipv6_hop_jumbo, - }, -- { -1, } -+ { -1, NULL } - }; -=20 - int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.32.38/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.= 38/net/ipv6/netfilter/ip6_tables.c ---- linux-2.6.32.38/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:00:52.= 000000000 -0400 -+++ linux-2.6.32.38/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:04:18.= 000000000 -0400 +diff -urNp linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.= 39/net/ipv6/netfilter/ip6_tables.c +--- linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:00:52.= 000000000 -0400 ++++ linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:04:18.= 000000000 -0400 @@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi private =3D &tmp; } @@ -60876,9 +58746,9 @@ diff -urNp linux-2.6.32.38/net/ipv6/netfilter/ip6= _tables.c linux-2.6.32.38/net/i info.valid_hooks =3D t->valid_hooks; memcpy(info.hook_entry, private->hook_entry, sizeof(info.hook_entry)); -diff -urNp linux-2.6.32.38/net/ipv6/raw.c linux-2.6.32.38/net/ipv6/raw.c ---- linux-2.6.32.38/net/ipv6/raw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/ipv6/raw.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/ipv6/raw.c linux-2.6.32.39/net/ipv6/raw.c +--- linux-2.6.32.39/net/ipv6/raw.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/ipv6/raw.c 2011-04-17 15:56:46.000000000 -0400 @@ -600,7 +600,7 @@ out: return err; } @@ -60940,9 +58810,9 @@ diff -urNp linux-2.6.32.38/net/ipv6/raw.c linux-2= .6.32.38/net/ipv6/raw.c } =20 static int raw6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.32.38/net/ipv6/tcp_ipv6.c linux-2.6.32.38/net/ipv6/= tcp_ipv6.c ---- linux-2.6.32.38/net/ipv6/tcp_ipv6.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/ipv6/tcp_ipv6.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/ipv6/tcp_ipv6.c linux-2.6.32.39/net/ipv6/= tcp_ipv6.c +--- linux-2.6.32.39/net/ipv6/tcp_ipv6.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/ipv6/tcp_ipv6.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #endif @@ -61042,9 +58912,9 @@ diff -urNp linux-2.6.32.38/net/ipv6/tcp_ipv6.c li= nux-2.6.32.38/net/ipv6/tcp_ipv6 } =20 static int tcp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.32.38/net/ipv6/udp.c linux-2.6.32.38/net/ipv6/udp.c ---- linux-2.6.32.38/net/ipv6/udp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/ipv6/udp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/ipv6/udp.c linux-2.6.32.39/net/ipv6/udp.c +--- linux-2.6.32.39/net/ipv6/udp.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/ipv6/udp.c 2011-04-17 15:56:46.000000000 -0400 @@ -49,6 +49,10 @@ #include #include "udp_impl.h" @@ -61080,9 +58950,9 @@ diff -urNp linux-2.6.32.38/net/ipv6/udp.c linux-2= .6.32.38/net/ipv6/udp.c atomic_read(&sp->sk_drops)); } =20 -diff -urNp linux-2.6.32.38/net/irda/ircomm/ircomm_tty.c linux-2.6.32.38/= net/irda/ircomm/ircomm_tty.c ---- linux-2.6.32.38/net/irda/ircomm/ircomm_tty.c 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c linux-2.6.32.39/= net/irda/ircomm/ircomm_tty.c +--- linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:56:46.000= 000000 -0400 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); =20 @@ -61205,9 +59075,9 @@ diff -urNp linux-2.6.32.38/net/irda/ircomm/ircomm= _tty.c linux-2.6.32.38/net/irda seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); =20 -diff -urNp linux-2.6.32.38/net/key/af_key.c linux-2.6.32.38/net/key/af_k= ey.c ---- linux-2.6.32.38/net/key/af_key.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/key/af_key.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/key/af_key.c linux-2.6.32.39/net/key/af_k= ey.c +--- linux-2.6.32.39/net/key/af_key.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/key/af_key.c 2011-04-17 15:56:46.000000000 -0400 @@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); else @@ -61220,9 +59090,9 @@ diff -urNp linux-2.6.32.38/net/key/af_key.c linux= -2.6.32.38/net/key/af_key.c atomic_read(&s->sk_refcnt), sk_rmem_alloc_get(s), sk_wmem_alloc_get(s), -diff -urNp linux-2.6.32.38/net/mac80211/cfg.c linux-2.6.32.38/net/mac802= 11/cfg.c ---- linux-2.6.32.38/net/mac80211/cfg.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/net/mac80211/cfg.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/net/mac80211/cfg.c linux-2.6.32.39/net/mac802= 11/cfg.c +--- linux-2.6.32.39/net/mac80211/cfg.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/net/mac80211/cfg.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(st return err; } @@ -61232,9 +59102,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/cfg.c lin= ux-2.6.32.38/net/mac80211/cfg.c .add_virtual_intf =3D ieee80211_add_iface, .del_virtual_intf =3D ieee80211_del_iface, .change_virtual_intf =3D ieee80211_change_iface, -diff -urNp linux-2.6.32.38/net/mac80211/cfg.h linux-2.6.32.38/net/mac802= 11/cfg.h ---- linux-2.6.32.38/net/mac80211/cfg.h 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/net/mac80211/cfg.h 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/net/mac80211/cfg.h linux-2.6.32.39/net/mac802= 11/cfg.h +--- linux-2.6.32.39/net/mac80211/cfg.h 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/net/mac80211/cfg.h 2011-04-17 15:56:46.000000000 -04= 00 @@ -4,6 +4,6 @@ #ifndef __CFG_H #define __CFG_H @@ -61243,9 +59113,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/cfg.h lin= ux-2.6.32.38/net/mac80211/cfg.h +extern const struct cfg80211_ops mac80211_config_ops; =20 #endif /* __CFG_H */ -diff -urNp linux-2.6.32.38/net/mac80211/debugfs_key.c linux-2.6.32.38/ne= t/mac80211/debugfs_key.c ---- linux-2.6.32.38/net/mac80211/debugfs_key.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/net/mac80211/debugfs_key.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/net/mac80211/debugfs_key.c linux-2.6.32.39/ne= t/mac80211/debugfs_key.c +--- linux-2.6.32.39/net/mac80211/debugfs_key.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/net/mac80211/debugfs_key.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file=20 size_t count, loff_t *ppos) { @@ -61261,9 +59131,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/debugfs_k= ey.c linux-2.6.32.38/net/mac802 =20 for (i =3D 0; i < key->conf.keylen; i++) p +=3D scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]); -diff -urNp linux-2.6.32.38/net/mac80211/ieee80211_i.h linux-2.6.32.38/ne= t/mac80211/ieee80211_i.h ---- linux-2.6.32.38/net/mac80211/ieee80211_i.h 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/net/mac80211/ieee80211_i.h 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/net/mac80211/ieee80211_i.h linux-2.6.32.39/ne= t/mac80211/ieee80211_i.h +--- linux-2.6.32.39/net/mac80211/ieee80211_i.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/net/mac80211/ieee80211_i.h 2011-04-17 15:56:46.00000= 0000 -0400 @@ -25,6 +25,7 @@ #include #include @@ -61281,9 +59151,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/ieee80211= _i.h linux-2.6.32.38/net/mac802 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; -diff -urNp linux-2.6.32.38/net/mac80211/iface.c linux-2.6.32.38/net/mac8= 0211/iface.c ---- linux-2.6.32.38/net/mac80211/iface.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/net/mac80211/iface.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/net/mac80211/iface.c linux-2.6.32.39/net/mac8= 0211/iface.c +--- linux-2.6.32.39/net/mac80211/iface.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/net/mac80211/iface.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev break; } @@ -61338,9 +59208,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/iface.c l= inux-2.6.32.38/net/mac80211/ifa ieee80211_clear_tx_pending(local); ieee80211_stop_device(local); =20 -diff -urNp linux-2.6.32.38/net/mac80211/main.c linux-2.6.32.38/net/mac80= 211/main.c ---- linux-2.6.32.38/net/mac80211/main.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/mac80211/main.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/mac80211/main.c linux-2.6.32.39/net/mac80= 211/main.c +--- linux-2.6.32.39/net/mac80211/main.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/mac80211/main.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level =3D power; } @@ -61350,9 +59220,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/main.c li= nux-2.6.32.38/net/mac80211/main ret =3D drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.32.38/net/mac80211/pm.c linux-2.6.32.38/net/mac8021= 1/pm.c ---- linux-2.6.32.38/net/mac80211/pm.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/net/mac80211/pm.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/net/mac80211/pm.c linux-2.6.32.39/net/mac8021= 1/pm.c +--- linux-2.6.32.39/net/mac80211/pm.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/net/mac80211/pm.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } =20 @@ -61362,9 +59232,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/pm.c linu= x-2.6.32.38/net/mac80211/pm.c ieee80211_stop_device(local); =20 local->suspended =3D true; -diff -urNp linux-2.6.32.38/net/mac80211/rate.c linux-2.6.32.38/net/mac80= 211/rate.c ---- linux-2.6.32.38/net/mac80211/rate.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/mac80211/rate.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/mac80211/rate.c linux-2.6.32.39/net/mac80= 211/rate.c +--- linux-2.6.32.39/net/mac80211/rate.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/mac80211/rate.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct=20 struct rate_control_ref *ref, *old; =20 @@ -61374,9 +59244,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/rate.c li= nux-2.6.32.38/net/mac80211/rate return -EBUSY; =20 ref =3D rate_control_alloc(name, local); -diff -urNp linux-2.6.32.38/net/mac80211/tx.c linux-2.6.32.38/net/mac8021= 1/tx.c ---- linux-2.6.32.38/net/mac80211/tx.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/net/mac80211/tx.c 2011-04-17 15:56:46.000000000 -040= 0 +diff -urNp linux-2.6.32.39/net/mac80211/tx.c linux-2.6.32.39/net/mac8021= 1/tx.c +--- linux-2.6.32.39/net/mac80211/tx.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/net/mac80211/tx.c 2011-04-17 15:56:46.000000000 -040= 0 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct=20 return cpu_to_le16(dur); } @@ -61386,9 +59256,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/tx.c linu= x-2.6.32.38/net/mac80211/tx.c struct net_device *dev) { return local =3D=3D wdev_priv(dev->ieee80211_ptr); -diff -urNp linux-2.6.32.38/net/mac80211/util.c linux-2.6.32.38/net/mac80= 211/util.c ---- linux-2.6.32.38/net/mac80211/util.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/mac80211/util.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/mac80211/util.c linux-2.6.32.39/net/mac80= 211/util.c +--- linux-2.6.32.39/net/mac80211/util.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/mac80211/util.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming =3D true; =20 @@ -61398,9 +59268,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/util.c li= nux-2.6.32.38/net/mac80211/util /* * Upon resume hardware can sometimes be goofy due to * various platform / driver / bus issues, so restarting -diff -urNp linux-2.6.32.38/net/netfilter/Kconfig linux-2.6.32.38/net/net= filter/Kconfig ---- linux-2.6.32.38/net/netfilter/Kconfig 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/net/netfilter/Kconfig 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/net/netfilter/Kconfig linux-2.6.32.39/net/net= filter/Kconfig +--- linux-2.6.32.39/net/netfilter/Kconfig 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/net/netfilter/Kconfig 2011-04-17 15:56:46.000000000 = -0400 @@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP =20 To compile it as a module, choose M here. If unsure, say N. @@ -61418,9 +59288,9 @@ diff -urNp linux-2.6.32.38/net/netfilter/Kconfig = linux-2.6.32.38/net/netfilter/K config NETFILTER_XT_MATCH_HASHLIMIT tristate '"hashlimit" match support' depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=3Dn) -diff -urNp linux-2.6.32.38/net/netfilter/Makefile linux-2.6.32.38/net/ne= tfilter/Makefile ---- linux-2.6.32.38/net/netfilter/Makefile 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/net/netfilter/Makefile 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/net/netfilter/Makefile linux-2.6.32.39/net/ne= tfilter/Makefile +--- linux-2.6.32.39/net/netfilter/Makefile 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/net/netfilter/Makefile 2011-04-17 15:56:46.000000000= -0400 @@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=3D xt_dccp.o obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) +=3D xt_dscp.o @@ -61429,9 +59299,9 @@ diff -urNp linux-2.6.32.38/net/netfilter/Makefile= linux-2.6.32.38/net/netfilter/ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) +=3D xt_hashlimit.o obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) +=3D xt_helper.o obj-$(CONFIG_NETFILTER_XT_MATCH_HL) +=3D xt_hl.o -diff -urNp linux-2.6.32.38/net/netfilter/nf_conntrack_netlink.c linux-2.= 6.32.38/net/netfilter/nf_conntrack_netlink.c ---- linux-2.6.32.38/net/netfilter/nf_conntrack_netlink.c 2011-03-27 14:3= 1:47.000000000 -0400 -+++ linux-2.6.32.38/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:5= 6:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c linux-2.= 6.32.39/net/netfilter/nf_conntrack_netlink.c +--- linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:5= 6:46.000000000 -0400 @@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt static int ctnetlink_parse_tuple(const struct nlattr * const cda[], @@ -61441,9 +59311,9 @@ diff -urNp linux-2.6.32.38/net/netfilter/nf_connt= rack_netlink.c linux-2.6.32.38/ { struct nlattr *tb[CTA_TUPLE_MAX+1]; int err; -diff -urNp linux-2.6.32.38/net/netfilter/xt_gradm.c linux-2.6.32.38/net/= netfilter/xt_gradm.c ---- linux-2.6.32.38/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.32.38/net/netfilter/xt_gradm.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/net/netfilter/xt_gradm.c linux-2.6.32.39/net/= netfilter/xt_gradm.c +--- linux-2.6.32.39/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.32.39/net/netfilter/xt_gradm.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -0,0 +1,51 @@ +/* + * gradm match for netfilter @@ -61496,9 +59366,9 @@ diff -urNp linux-2.6.32.38/net/netfilter/xt_gradm= .c linux-2.6.32.38/net/netfilte +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_gradm"); +MODULE_ALIAS("ip6t_gradm"); -diff -urNp linux-2.6.32.38/net/netlink/af_netlink.c linux-2.6.32.38/net/= netlink/af_netlink.c ---- linux-2.6.32.38/net/netlink/af_netlink.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/net/netlink/af_netlink.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/net/netlink/af_netlink.c linux-2.6.32.39/net/= netlink/af_netlink.c +--- linux-2.6.32.39/net/netlink/af_netlink.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/net/netlink/af_netlink.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f struct netlink_sock *nlk =3D nlk_sk(s); =20 @@ -61521,9 +59391,9 @@ diff -urNp linux-2.6.32.38/net/netlink/af_netlink= .c linux-2.6.32.38/net/netlink/ atomic_read(&s->sk_refcnt), atomic_read(&s->sk_drops) ); -diff -urNp linux-2.6.32.38/net/netrom/af_netrom.c linux-2.6.32.38/net/ne= trom/af_netrom.c ---- linux-2.6.32.38/net/netrom/af_netrom.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/net/netrom/af_netrom.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/net/netrom/af_netrom.c linux-2.6.32.39/net/ne= trom/af_netrom.c +--- linux-2.6.32.39/net/netrom/af_netrom.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/net/netrom/af_netrom.c 2011-04-17 15:56:46.000000000= -0400 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc struct sock *sk =3D sock->sk; struct nr_sock *nr =3D nr_sk(sk); @@ -61540,9 +59410,9 @@ diff -urNp linux-2.6.32.38/net/netrom/af_netrom.c= linux-2.6.32.38/net/netrom/af_ sax->fsa_ax25.sax25_call =3D nr->source_addr; *uaddr_len =3D sizeof(struct sockaddr_ax25); } -diff -urNp linux-2.6.32.38/net/packet/af_packet.c linux-2.6.32.38/net/pa= cket/af_packet.c ---- linux-2.6.32.38/net/packet/af_packet.c 2011-04-17 17:00:52.000000000= -0400 -+++ linux-2.6.32.38/net/packet/af_packet.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/net/packet/af_packet.c linux-2.6.32.39/net/pa= cket/af_packet.c +--- linux-2.6.32.39/net/packet/af_packet.c 2011-04-17 17:00:52.000000000= -0400 ++++ linux-2.6.32.39/net/packet/af_packet.c 2011-04-17 15:56:46.000000000= -0400 @@ -2427,7 +2427,11 @@ static int packet_seq_show(struct seq_fi =20 seq_printf(seq, @@ -61555,9 +59425,9 @@ diff -urNp linux-2.6.32.38/net/packet/af_packet.c= linux-2.6.32.38/net/packet/af_ atomic_read(&s->sk_refcnt), s->sk_type, ntohs(po->num), -diff -urNp linux-2.6.32.38/net/phonet/af_phonet.c linux-2.6.32.38/net/ph= onet/af_phonet.c ---- linux-2.6.32.38/net/phonet/af_phonet.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/net/phonet/af_phonet.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/net/phonet/af_phonet.c linux-2.6.32.39/net/ph= onet/af_phonet.c +--- linux-2.6.32.39/net/phonet/af_phonet.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/net/phonet/af_phonet.c 2011-04-17 15:56:46.000000000= -0400 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr { struct phonet_protocol *pp; @@ -61576,9 +59446,9 @@ diff -urNp linux-2.6.32.38/net/phonet/af_phonet.c= linux-2.6.32.38/net/phonet/af_ return -EINVAL; =20 err =3D proto_register(pp->prot, 1); -diff -urNp linux-2.6.32.38/net/phonet/socket.c linux-2.6.32.38/net/phone= t/socket.c ---- linux-2.6.32.38/net/phonet/socket.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/phonet/socket.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/phonet/socket.c linux-2.6.32.39/net/phone= t/socket.c +--- linux-2.6.32.39/net/phonet/socket.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/phonet/socket.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -482,7 +482,12 @@ static int pn_sock_seq_show(struct seq_f sk->sk_state, sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), @@ -61593,9 +59463,9 @@ diff -urNp linux-2.6.32.38/net/phonet/socket.c li= nux-2.6.32.38/net/phonet/socket atomic_read(&sk->sk_drops), &len); } seq_printf(seq, "%*s\n", 127 - len, ""); -diff -urNp linux-2.6.32.38/net/rds/Kconfig linux-2.6.32.38/net/rds/Kconf= ig ---- linux-2.6.32.38/net/rds/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/rds/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/rds/Kconfig linux-2.6.32.39/net/rds/Kconf= ig +--- linux-2.6.32.39/net/rds/Kconfig 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/rds/Kconfig 2011-04-17 15:56:46.000000000 -0400 @@ -1,7 +1,7 @@ =20 config RDS @@ -61605,9 +59475,9 @@ diff -urNp linux-2.6.32.38/net/rds/Kconfig linux-= 2.6.32.38/net/rds/Kconfig ---help--- The RDS (Reliable Datagram Sockets) protocol provides reliable, sequenced delivery of datagrams over Infiniband, iWARP, -diff -urNp linux-2.6.32.38/net/rxrpc/ar-key.c linux-2.6.32.38/net/rxrpc/= ar-key.c ---- linux-2.6.32.38/net/rxrpc/ar-key.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/net/rxrpc/ar-key.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/net/rxrpc/ar-key.c linux-2.6.32.39/net/rxrpc/= ar-key.c +--- linux-2.6.32.39/net/rxrpc/ar-key.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/net/rxrpc/ar-key.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(s return ret; =20 @@ -61635,9 +59505,9 @@ diff -urNp linux-2.6.32.38/net/rxrpc/ar-key.c lin= ux-2.6.32.38/net/rxrpc/ar-key.c if (!token->kad) goto error_free; =20 -diff -urNp linux-2.6.32.38/net/sctp/proc.c linux-2.6.32.38/net/sctp/proc= .c ---- linux-2.6.32.38/net/sctp/proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/sctp/proc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/sctp/proc.c linux-2.6.32.39/net/sctp/proc= .c +--- linux-2.6.32.39/net/sctp/proc.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/sctp/proc.c 2011-04-17 15:56:46.000000000 -0400 @@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_ sctp_for_each_hentry(epb, node, &head->chain) { ep =3D sctp_ep(epb); @@ -61666,18 +59536,9 @@ diff -urNp linux-2.6.32.38/net/sctp/proc.c linux= -2.6.32.38/net/sctp/proc.c assoc->state, hash, assoc->assoc_id, assoc->sndbuf_used, -diff -urNp linux-2.6.32.38/net/sctp/socket.c linux-2.6.32.38/net/sctp/so= cket.c ---- linux-2.6.32.38/net/sctp/socket.c 2011-03-27 14:31:47.000000000 -040= 0 -+++ linux-2.6.32.38/net/sctp/socket.c 2011-04-17 15:56:46.000000000 -040= 0 -@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc - struct sctp_sndrcvinfo *sinfo; - struct sctp_initmsg *sinit; - sctp_assoc_t associd =3D 0; -- sctp_cmsgs_t cmsgs =3D { NULL }; -+ sctp_cmsgs_t cmsgs =3D { NULL, NULL }; - int err; - sctp_scope_t scope; - long timeo; +diff -urNp linux-2.6.32.39/net/sctp/socket.c linux-2.6.32.39/net/sctp/so= cket.c +--- linux-2.6.32.39/net/sctp/socket.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.39/net/sctp/socket.c 2011-04-23 12:56:11.000000000 -040= 0 @@ -5802,7 +5802,6 @@ pp_found: */ int reuse =3D sk->sk_reuse; @@ -61686,9 +59547,9 @@ diff -urNp linux-2.6.32.38/net/sctp/socket.c linu= x-2.6.32.38/net/sctp/socket.c =20 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.32.38/net/socket.c linux-2.6.32.38/net/socket.c ---- linux-2.6.32.38/net/socket.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/socket.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/socket.c linux-2.6.32.39/net/socket.c +--- linux-2.6.32.39/net/socket.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/socket.c 2011-04-17 15:56:46.000000000 -0400 @@ -87,6 +87,7 @@ #include #include @@ -61852,9 +59713,9 @@ diff -urNp linux-2.6.32.38/net/socket.c linux-2.6= .32.38/net/socket.c err =3D security_socket_connect(sock, (struct sockaddr *)&address, addrlen= ); if (err) -diff -urNp linux-2.6.32.38/net/sunrpc/sched.c linux-2.6.32.38/net/sunrpc= /sched.c ---- linux-2.6.32.38/net/sunrpc/sched.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/net/sunrpc/sched.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/net/sunrpc/sched.c linux-2.6.32.39/net/sunrpc= /sched.c +--- linux-2.6.32.39/net/sunrpc/sched.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/net/sunrpc/sched.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w #ifdef RPC_DEBUG static void rpc_task_set_debuginfo(struct rpc_task *task) @@ -61868,9 +59729,9 @@ diff -urNp linux-2.6.32.38/net/sunrpc/sched.c lin= ux-2.6.32.38/net/sunrpc/sched.c } #else static inline void rpc_task_set_debuginfo(struct rpc_task *task) -diff -urNp linux-2.6.32.38/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.3= 8/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.32.38/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.3= 9/net/sunrpc/xprtrdma/svc_rdma.c +--- linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta len -=3D *ppos; if (len > *lenp) @@ -61880,9 +59741,9 @@ diff -urNp linux-2.6.32.38/net/sunrpc/xprtrdma/sv= c_rdma.c linux-2.6.32.38/net/su return -EFAULT; *lenp =3D len; *ppos +=3D len; -diff -urNp linux-2.6.32.38/net/sysctl_net.c linux-2.6.32.38/net/sysctl_n= et.c ---- linux-2.6.32.38/net/sysctl_net.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/sysctl_net.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/net/sysctl_net.c linux-2.6.32.39/net/sysctl_n= et.c +--- linux-2.6.32.39/net/sysctl_net.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/net/sysctl_net.c 2011-04-17 15:56:46.000000000 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -61892,24 +59753,9 @@ diff -urNp linux-2.6.32.38/net/sysctl_net.c linu= x-2.6.32.38/net/sysctl_net.c int mode =3D (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.32.38/net/tipc/socket.c linux-2.6.32.38/net/tipc/so= cket.c ---- linux-2.6.32.38/net/tipc/socket.c 2011-04-17 17:00:52.000000000 -040= 0 -+++ linux-2.6.32.38/net/tipc/socket.c 2011-04-17 15:56:46.000000000 -040= 0 -@@ -1450,8 +1450,9 @@ static int connect(struct socket *sock,=20 - } else { - if (res =3D=3D 0) - res =3D -ETIMEDOUT; -- else -- ; /* leave "res" unchanged */ -+ else { -+ /* leave "res" unchanged */ -+ } - sock->state =3D SS_DISCONNECTING; - } -=20 -diff -urNp linux-2.6.32.38/net/unix/af_unix.c linux-2.6.32.38/net/unix/a= f_unix.c ---- linux-2.6.32.38/net/unix/af_unix.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/net/unix/af_unix.c 2011-04-17 15:56:46.000000000 -04= 00 +diff -urNp linux-2.6.32.39/net/unix/af_unix.c linux-2.6.32.39/net/unix/a= f_unix.c +--- linux-2.6.32.39/net/unix/af_unix.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.39/net/unix/af_unix.c 2011-04-17 15:56:46.000000000 -04= 00 @@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru err =3D -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -61979,9 +59825,9 @@ diff -urNp linux-2.6.32.38/net/unix/af_unix.c lin= ux-2.6.32.38/net/unix/af_unix.c atomic_read(&s->sk_refcnt), 0, s->sk_state =3D=3D TCP_LISTEN ? __SO_ACCEPTCON : 0, -diff -urNp linux-2.6.32.38/net/wireless/wext.c linux-2.6.32.38/net/wirel= ess/wext.c ---- linux-2.6.32.38/net/wireless/wext.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/net/wireless/wext.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/net/wireless/wext.c linux-2.6.32.39/net/wirel= ess/wext.c +--- linux-2.6.32.39/net/wireless/wext.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/net/wireless/wext.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc */ =20 @@ -62015,30 +59861,9 @@ diff -urNp linux-2.6.32.38/net/wireless/wext.c l= inux-2.6.32.38/net/wireless/wext err =3D handler(dev, info, (union iwreq_data *) iwp, extra); =20 iwp->length +=3D essid_compat; -diff -urNp linux-2.6.32.38/net/x25/x25_in.c linux-2.6.32.38/net/x25/x25_= in.c ---- linux-2.6.32.38/net/x25/x25_in.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/net/x25/x25_in.c 2011-04-17 15:56:46.000000000 -0400 -@@ -108,14 +108,13 @@ static int x25_state1_machine(struct soc - */ - skb_pull(skb, X25_STD_MIN_LEN); -=20 -- len =3D x25_parse_address_block(skb, &source_addr, -- &dest_addr); -+ len =3D x25_addr_ntoa(skb->data, &source_addr, &dest_addr); - if (len > 0) - skb_pull(skb, len); -=20 - len =3D x25_parse_facilities(skb, &x25->facilities, -- &x25->dte_facilities, -- &x25->vc_facil_mask); -+ &x25->dte_facilities, -+ &x25->vc_facil_mask); - if (len > 0) - skb_pull(skb, len); - else -diff -urNp linux-2.6.32.38/net/xfrm/xfrm_policy.c linux-2.6.32.38/net/xf= rm/xfrm_policy.c ---- linux-2.6.32.38/net/xfrm/xfrm_policy.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/net/xfrm/xfrm_policy.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/net/xfrm/xfrm_policy.c linux-2.6.32.39/net/xf= rm/xfrm_policy.c +--- linux-2.6.32.39/net/xfrm/xfrm_policy.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/net/xfrm/xfrm_policy.c 2011-04-17 15:56:46.000000000= -0400 @@ -1477,7 +1477,7 @@ free_dst: goto out; } @@ -62066,9 +59891,9 @@ diff -urNp linux-2.6.32.38/net/xfrm/xfrm_policy.c= linux-2.6.32.38/net/xfrm/xfrm_ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) { #ifdef CONFIG_XFRM_SUB_POLICY -diff -urNp linux-2.6.32.38/samples/kobject/kset-example.c linux-2.6.32.3= 8/samples/kobject/kset-example.c ---- linux-2.6.32.38/samples/kobject/kset-example.c 2011-03-27 14:31:47.0= 00000000 -0400 -+++ linux-2.6.32.38/samples/kobject/kset-example.c 2011-04-17 15:56:46.0= 00000000 -0400 +diff -urNp linux-2.6.32.39/samples/kobject/kset-example.c linux-2.6.32.3= 9/samples/kobject/kset-example.c +--- linux-2.6.32.39/samples/kobject/kset-example.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.39/samples/kobject/kset-example.c 2011-04-17 15:56:46.0= 00000000 -0400 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } =20 @@ -62078,9 +59903,9 @@ diff -urNp linux-2.6.32.38/samples/kobject/kset-e= xample.c linux-2.6.32.38/sample .show =3D foo_attr_show, .store =3D foo_attr_store, }; -diff -urNp linux-2.6.32.38/scripts/basic/fixdep.c linux-2.6.32.38/script= s/basic/fixdep.c ---- linux-2.6.32.38/scripts/basic/fixdep.c 2011-03-27 14:31:47.000000000= -0400 -+++ linux-2.6.32.38/scripts/basic/fixdep.c 2011-04-17 15:56:46.000000000= -0400 +diff -urNp linux-2.6.32.39/scripts/basic/fixdep.c linux-2.6.32.39/script= s/basic/fixdep.c +--- linux-2.6.32.39/scripts/basic/fixdep.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.39/scripts/basic/fixdep.c 2011-04-17 15:56:46.000000000= -0400 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen =20 static void parse_config_file(char *map, size_t len) @@ -62102,27 +59927,9 @@ diff -urNp linux-2.6.32.38/scripts/basic/fixdep.= c linux-2.6.32.38/scripts/basic/ =20 if (*p !=3D INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) !=3D 4 or wrong endianess? %#x\n= ", -diff -urNp linux-2.6.32.38/scripts/kallsyms.c linux-2.6.32.38/scripts/ka= llsyms.c ---- linux-2.6.32.38/scripts/kallsyms.c 2011-03-27 14:31:47.000000000 -04= 00 -+++ linux-2.6.32.38/scripts/kallsyms.c 2011-04-17 15:56:46.000000000 -04= 00 -@@ -43,10 +43,10 @@ struct text_range { -=20 - static unsigned long long _text; - static struct text_range text_ranges[] =3D { -- { "_stext", "_etext" }, -- { "_sinittext", "_einittext" }, -- { "_stext_l1", "_etext_l1" }, /* Blackfin on-chip L1 inst SRAM */ -- { "_stext_l2", "_etext_l2" }, /* Blackfin on-chip L2 SRAM */ -+ { "_stext", "_etext", 0, 0 }, -+ { "_sinittext", "_einittext", 0, 0 }, -+ { "_stext_l1", "_etext_l1", 0, 0 }, /* Blackfin on-chip L1 inst SRAM= */ -+ { "_stext_l2", "_etext_l2", 0, 0 }, /* Blackfin on-chip L2 SRAM */ - }; - #define text_range_text (&text_ranges[0]) - #define text_range_inittext (&text_ranges[1]) -diff -urNp linux-2.6.32.38/scripts/mod/file2alias.c linux-2.6.32.38/scri= pts/mod/file2alias.c ---- linux-2.6.32.38/scripts/mod/file2alias.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/scripts/mod/file2alias.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/scripts/mod/file2alias.c linux-2.6.32.39/scri= pts/mod/file2alias.c +--- linux-2.6.32.39/scripts/mod/file2alias.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/scripts/mod/file2alias.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -62177,9 +59984,9 @@ diff -urNp linux-2.6.32.38/scripts/mod/file2alias= .c linux-2.6.32.38/scripts/mod/ =20 sprintf(alias, "dmi*"); =20 -diff -urNp linux-2.6.32.38/scripts/mod/modpost.c linux-2.6.32.38/scripts= /mod/modpost.c ---- linux-2.6.32.38/scripts/mod/modpost.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/scripts/mod/modpost.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/scripts/mod/modpost.c linux-2.6.32.39/scripts= /mod/modpost.c +--- linux-2.6.32.39/scripts/mod/modpost.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/scripts/mod/modpost.c 2011-04-17 15:56:46.000000000 = -0400 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -62247,9 +60054,9 @@ diff -urNp linux-2.6.32.38/scripts/mod/modpost.c = linux-2.6.32.38/scripts/mod/mod goto close_write; =20 tmp =3D NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.32.38/scripts/mod/modpost.h linux-2.6.32.38/scripts= /mod/modpost.h ---- linux-2.6.32.38/scripts/mod/modpost.h 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/scripts/mod/modpost.h 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/scripts/mod/modpost.h linux-2.6.32.39/scripts= /mod/modpost.h +--- linux-2.6.32.39/scripts/mod/modpost.h 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/scripts/mod/modpost.h 2011-04-17 15:56:46.000000000 = -0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e =20 struct buffer { @@ -62269,9 +60076,9 @@ diff -urNp linux-2.6.32.38/scripts/mod/modpost.h = linux-2.6.32.38/scripts/mod/mod =20 struct module { struct module *next; -diff -urNp linux-2.6.32.38/scripts/mod/sumversion.c linux-2.6.32.38/scri= pts/mod/sumversion.c ---- linux-2.6.32.38/scripts/mod/sumversion.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/scripts/mod/sumversion.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/scripts/mod/sumversion.c linux-2.6.32.39/scri= pts/mod/sumversion.c +--- linux-2.6.32.39/scripts/mod/sumversion.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/scripts/mod/sumversion.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -62281,9 +60088,9 @@ diff -urNp linux-2.6.32.38/scripts/mod/sumversion= .c linux-2.6.32.38/scripts/mod/ warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.32.38/scripts/pnmtologo.c linux-2.6.32.38/scripts/p= nmtologo.c ---- linux-2.6.32.38/scripts/pnmtologo.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/scripts/pnmtologo.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/scripts/pnmtologo.c linux-2.6.32.39/scripts/p= nmtologo.c +--- linux-2.6.32.39/scripts/pnmtologo.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/scripts/pnmtologo.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -62310,9 +60117,9 @@ diff -urNp linux-2.6.32.38/scripts/pnmtologo.c li= nux-2.6.32.38/scripts/pnmtologo logoname); write_hex_cnt =3D 0; for (i =3D 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.32.38/security/capability.c linux-2.6.32.38/securit= y/capability.c ---- linux-2.6.32.38/security/capability.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/security/capability.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/security/capability.c linux-2.6.32.39/securit= y/capability.c +--- linux-2.6.32.39/security/capability.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/security/capability.c 2011-04-17 15:56:46.000000000 = -0400 @@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls } #endif /* CONFIG_AUDIT */ @@ -62322,9 +60129,9 @@ diff -urNp linux-2.6.32.38/security/capability.c = linux-2.6.32.38/security/capabi .name =3D "default", }; =20 -diff -urNp linux-2.6.32.38/security/commoncap.c linux-2.6.32.38/security= /commoncap.c ---- linux-2.6.32.38/security/commoncap.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/security/commoncap.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/security/commoncap.c linux-2.6.32.39/security= /commoncap.c +--- linux-2.6.32.39/security/commoncap.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/security/commoncap.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -27,7 +27,7 @@ #include #include @@ -62357,9 +60164,9 @@ diff -urNp linux-2.6.32.38/security/commoncap.c l= inux-2.6.32.38/security/commonc if (cred->uid !=3D 0) { if (bprm->cap_effective) return 1; -diff -urNp linux-2.6.32.38/security/integrity/ima/ima_api.c linux-2.6.32= .38/security/integrity/ima/ima_api.c ---- linux-2.6.32.38/security/integrity/ima/ima_api.c 2011-03-27 14:31:47= .000000000 -0400 -+++ linux-2.6.32.38/security/integrity/ima/ima_api.c 2011-04-17 15:56:46= .000000000 -0400 +diff -urNp linux-2.6.32.39/security/integrity/ima/ima_api.c linux-2.6.32= .39/security/integrity/ima/ima_api.c +--- linux-2.6.32.39/security/integrity/ima/ima_api.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.39/security/integrity/ima/ima_api.c 2011-04-17 15:56:46= .000000000 -0400 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino int result; =20 @@ -62369,9 +60176,9 @@ diff -urNp linux-2.6.32.38/security/integrity/ima= /ima_api.c linux-2.6.32.38/secu =20 entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.32.38/security/integrity/ima/ima_fs.c linux-2.6.32.= 38/security/integrity/ima/ima_fs.c ---- linux-2.6.32.38/security/integrity/ima/ima_fs.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/security/integrity/ima/ima_fs.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/security/integrity/ima/ima_fs.c linux-2.6.32.= 39/security/integrity/ima/ima_fs.c +--- linux-2.6.32.39/security/integrity/ima/ima_fs.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/security/integrity/ima/ima_fs.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -27,12 +27,12 @@ static int valid_policy =3D 1; #define TMPBUFLEN 12 @@ -62387,9 +60194,9 @@ diff -urNp linux-2.6.32.38/security/integrity/ima= /ima_fs.c linux-2.6.32.38/secur return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } =20 -diff -urNp linux-2.6.32.38/security/integrity/ima/ima.h linux-2.6.32.38/= security/integrity/ima/ima.h ---- linux-2.6.32.38/security/integrity/ima/ima.h 2011-03-27 14:31:47.000= 000000 -0400 -+++ linux-2.6.32.38/security/integrity/ima/ima.h 2011-04-17 15:56:46.000= 000000 -0400 +diff -urNp linux-2.6.32.39/security/integrity/ima/ima.h linux-2.6.32.39/= security/integrity/ima/ima.h +--- linux-2.6.32.39/security/integrity/ima/ima.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.39/security/integrity/ima/ima.h 2011-04-17 15:56:46.000= 000000 -0400 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; =20 @@ -62401,9 +60208,9 @@ diff -urNp linux-2.6.32.38/security/integrity/ima= /ima.h linux-2.6.32.38/security struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.32.38/security/integrity/ima/ima_queue.c linux-2.6.= 32.38/security/integrity/ima/ima_queue.c ---- linux-2.6.32.38/security/integrity/ima/ima_queue.c 2011-03-27 14:31:= 47.000000000 -0400 -+++ linux-2.6.32.38/security/integrity/ima/ima_queue.c 2011-04-17 15:56:= 46.000000000 -0400 +diff -urNp linux-2.6.32.39/security/integrity/ima/ima_queue.c linux-2.6.= 32.39/security/integrity/ima/ima_queue.c +--- linux-2.6.32.39/security/integrity/ima/ima_queue.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.39/security/integrity/ima/ima_queue.c 2011-04-17 15:56:= 46.000000000 -0400 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); list_add_tail_rcu(&qe->later, &ima_measurements); @@ -62413,9 +60220,9 @@ diff -urNp linux-2.6.32.38/security/integrity/ima= /ima_queue.c linux-2.6.32.38/se key =3D ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.32.38/security/Kconfig linux-2.6.32.38/security/Kco= nfig ---- linux-2.6.32.38/security/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.38/security/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kco= nfig +--- linux-2.6.32.39/security/Kconfig 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.39/security/Kconfig 2011-04-17 15:56:46.000000000 -0400 @@ -4,6 +4,532 @@ =20 menu "Security options" @@ -62958,9 +60765,9 @@ diff -urNp linux-2.6.32.38/security/Kconfig linux= -2.6.32.38/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.38/security/keys/keyring.c linux-2.6.32.38/secur= ity/keys/keyring.c ---- linux-2.6.32.38/security/keys/keyring.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/security/keys/keyring.c 2011-04-18 22:03:00.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/security/keys/keyring.c linux-2.6.32.39/secur= ity/keys/keyring.c +--- linux-2.6.32.39/security/keys/keyring.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/security/keys/keyring.c 2011-04-18 22:03:00.00000000= 0 -0400 @@ -214,15 +214,15 @@ static long keyring_read(const struct ke ret =3D -EFAULT; =20 @@ -62980,9 +60787,9 @@ diff -urNp linux-2.6.32.38/security/keys/keyring.= c linux-2.6.32.38/security/keys goto error; =20 buflen -=3D tmp; -diff -urNp linux-2.6.32.38/security/min_addr.c linux-2.6.32.38/security/= min_addr.c ---- linux-2.6.32.38/security/min_addr.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/security/min_addr.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/security/min_addr.c linux-2.6.32.39/security/= min_addr.c +--- linux-2.6.32.39/security/min_addr.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/security/min_addr.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr =3D CONFIG */ static void update_mmap_min_addr(void) @@ -62999,9 +60806,9 @@ diff -urNp linux-2.6.32.38/security/min_addr.c li= nux-2.6.32.38/security/min_addr } =20 /* -diff -urNp linux-2.6.32.38/security/root_plug.c linux-2.6.32.38/security= /root_plug.c ---- linux-2.6.32.38/security/root_plug.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/security/root_plug.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/security/root_plug.c linux-2.6.32.39/security= /root_plug.c +--- linux-2.6.32.39/security/root_plug.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/security/root_plug.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -70,7 +70,7 @@ static int rootplug_bprm_check_security=20 return 0; } @@ -63011,9 +60818,9 @@ diff -urNp linux-2.6.32.38/security/root_plug.c l= inux-2.6.32.38/security/root_pl .bprm_check_security =3D rootplug_bprm_check_security, }; =20 -diff -urNp linux-2.6.32.38/security/security.c linux-2.6.32.38/security/= security.c ---- linux-2.6.32.38/security/security.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/security/security.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/security/security.c linux-2.6.32.39/security/= security.c +--- linux-2.6.32.39/security/security.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/security/security.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI extern struct security_operations default_security_ops; extern void security_fixup_ops(struct security_operations *ops); @@ -63032,9 +60839,9 @@ diff -urNp linux-2.6.32.38/security/security.c li= nux-2.6.32.38/security/security { if (verify(ops)) { printk(KERN_DEBUG "%s could not verify " -diff -urNp linux-2.6.32.38/security/selinux/hooks.c linux-2.6.32.38/secu= rity/selinux/hooks.c ---- linux-2.6.32.38/security/selinux/hooks.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/security/selinux/hooks.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/security/selinux/hooks.c linux-2.6.32.39/secu= rity/selinux/hooks.c +--- linux-2.6.32.39/security/selinux/hooks.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/security/selinux/hooks.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -131,7 +131,7 @@ int selinux_enabled =3D 1; * Minimal support for a secondary security module, * just to allow the use of the capability module. @@ -63063,9 +60870,9 @@ diff -urNp linux-2.6.32.38/security/selinux/hooks= .c linux-2.6.32.38/security/sel =20 /* Unregister netfilter hooks. */ selinux_nf_ip_exit(); -diff -urNp linux-2.6.32.38/security/smack/smack_lsm.c linux-2.6.32.38/se= curity/smack/smack_lsm.c ---- linux-2.6.32.38/security/smack/smack_lsm.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/security/smack/smack_lsm.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/security/smack/smack_lsm.c linux-2.6.32.39/se= curity/smack/smack_lsm.c +--- linux-2.6.32.39/security/smack/smack_lsm.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/security/smack/smack_lsm.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct=20 return 0; } @@ -63075,9 +60882,9 @@ diff -urNp linux-2.6.32.38/security/smack/smack_l= sm.c linux-2.6.32.38/security/s .name =3D "smack", =20 .ptrace_access_check =3D smack_ptrace_access_check, -diff -urNp linux-2.6.32.38/security/tomoyo/tomoyo.c linux-2.6.32.38/secu= rity/tomoyo/tomoyo.c ---- linux-2.6.32.38/security/tomoyo/tomoyo.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/security/tomoyo/tomoyo.c 2011-04-17 15:56:46.0000000= 00 -0400 +diff -urNp linux-2.6.32.39/security/tomoyo/tomoyo.c linux-2.6.32.39/secu= rity/tomoyo/tomoyo.c +--- linux-2.6.32.39/security/tomoyo/tomoyo.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.39/security/tomoyo/tomoyo.c 2011-04-17 15:56:46.0000000= 00 -0400 @@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil * tomoyo_security_ops is a "struct security_operations" which is used = for * registering TOMOYO. @@ -63087,9 +60894,9 @@ diff -urNp linux-2.6.32.38/security/tomoyo/tomoyo= .c linux-2.6.32.38/security/tom .name =3D "tomoyo", .cred_alloc_blank =3D tomoyo_cred_alloc_blank, .cred_prepare =3D tomoyo_cred_prepare, -diff -urNp linux-2.6.32.38/sound/aoa/codecs/onyx.c linux-2.6.32.38/sound= /aoa/codecs/onyx.c ---- linux-2.6.32.38/sound/aoa/codecs/onyx.c 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/sound/aoa/codecs/onyx.c 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/sound/aoa/codecs/onyx.c linux-2.6.32.39/sound= /aoa/codecs/onyx.c +--- linux-2.6.32.39/sound/aoa/codecs/onyx.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/sound/aoa/codecs/onyx.c 2011-04-17 15:56:46.00000000= 0 -0400 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -63118,9 +60925,9 @@ diff -urNp linux-2.6.32.38/sound/aoa/codecs/onyx.= c linux-2.6.32.38/sound/aoa/cod onyx->spdif_locked =3D onyx->analog_locked =3D 0; mutex_unlock(&onyx->mutex); =20 -diff -urNp linux-2.6.32.38/sound/aoa/codecs/onyx.h linux-2.6.32.38/sound= /aoa/codecs/onyx.h ---- linux-2.6.32.38/sound/aoa/codecs/onyx.h 2011-03-27 14:31:47.00000000= 0 -0400 -+++ linux-2.6.32.38/sound/aoa/codecs/onyx.h 2011-04-17 15:56:46.00000000= 0 -0400 +diff -urNp linux-2.6.32.39/sound/aoa/codecs/onyx.h linux-2.6.32.39/sound= /aoa/codecs/onyx.h +--- linux-2.6.32.39/sound/aoa/codecs/onyx.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.39/sound/aoa/codecs/onyx.h 2011-04-17 15:56:46.00000000= 0 -0400 @@ -11,6 +11,7 @@ #include #include @@ -63129,41 +60936,9 @@ diff -urNp linux-2.6.32.38/sound/aoa/codecs/onyx= .h linux-2.6.32.38/sound/aoa/cod =20 /* PCM3052 register definitions */ =20 -diff -urNp linux-2.6.32.38/sound/core/oss/pcm_oss.c linux-2.6.32.38/soun= d/core/oss/pcm_oss.c ---- linux-2.6.32.38/sound/core/oss/pcm_oss.c 2011-03-27 14:31:47.0000000= 00 -0400 -+++ linux-2.6.32.38/sound/core/oss/pcm_oss.c 2011-04-17 15:56:46.0000000= 00 -0400 -@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct - } - } - #else /* !CONFIG_SND_VERBOSE_PROCFS */ --#define snd_pcm_oss_proc_init(pcm) --#define snd_pcm_oss_proc_done(pcm) -+#define snd_pcm_oss_proc_init(pcm) do {} while (0) -+#define snd_pcm_oss_proc_done(pcm) do {} while (0) - #endif /* CONFIG_SND_VERBOSE_PROCFS */ -=20 - /* -diff -urNp linux-2.6.32.38/sound/core/seq/seq_lock.h linux-2.6.32.38/sou= nd/core/seq/seq_lock.h ---- linux-2.6.32.38/sound/core/seq/seq_lock.h 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/sound/core/seq/seq_lock.h 2011-04-17 15:56:46.000000= 000 -0400 -@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo - #else /* SMP || CONFIG_SND_DEBUG */ -=20 - typedef spinlock_t snd_use_lock_t; /* dummy */ --#define snd_use_lock_init(lockp) /**/ --#define snd_use_lock_use(lockp) /**/ --#define snd_use_lock_free(lockp) /**/ --#define snd_use_lock_sync(lockp) /**/ -+#define snd_use_lock_init(lockp) do {} while (0) -+#define snd_use_lock_use(lockp) do {} while (0) -+#define snd_use_lock_free(lockp) do {} while (0) -+#define snd_use_lock_sync(lockp) do {} while (0) -=20 - #endif /* SMP || CONFIG_SND_DEBUG */ -=20 -diff -urNp linux-2.6.32.38/sound/drivers/mts64.c linux-2.6.32.38/sound/d= rivers/mts64.c ---- linux-2.6.32.38/sound/drivers/mts64.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/sound/drivers/mts64.c 2011-04-17 15:56:46.000000000 = -0400 +diff -urNp linux-2.6.32.39/sound/drivers/mts64.c linux-2.6.32.39/sound/d= rivers/mts64.c +--- linux-2.6.32.39/sound/drivers/mts64.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/sound/drivers/mts64.c 2011-04-17 15:56:46.000000000 = -0400 @@ -27,6 +27,7 @@ #include #include @@ -63220,9 +60995,9 @@ diff -urNp linux-2.6.32.38/sound/drivers/mts64.c = linux-2.6.32.38/sound/drivers/m =20 return 0; } -diff -urNp linux-2.6.32.38/sound/drivers/portman2x4.c linux-2.6.32.38/so= und/drivers/portman2x4.c ---- linux-2.6.32.38/sound/drivers/portman2x4.c 2011-03-27 14:31:47.00000= 0000 -0400 -+++ linux-2.6.32.38/sound/drivers/portman2x4.c 2011-04-17 15:56:46.00000= 0000 -0400 +diff -urNp linux-2.6.32.39/sound/drivers/portman2x4.c linux-2.6.32.39/so= und/drivers/portman2x4.c +--- linux-2.6.32.39/sound/drivers/portman2x4.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.39/sound/drivers/portman2x4.c 2011-04-17 15:56:46.00000= 0000 -0400 @@ -46,6 +46,7 @@ #include #include @@ -63240,9 +61015,9 @@ diff -urNp linux-2.6.32.38/sound/drivers/portman2= x4.c linux-2.6.32.38/sound/driv int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.32.38/sound/oss/sb_audio.c linux-2.6.32.38/sound/os= s/sb_audio.c ---- linux-2.6.32.38/sound/oss/sb_audio.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/sound/oss/sb_audio.c 2011-04-17 15:56:46.000000000 -= 0400 +diff -urNp linux-2.6.32.39/sound/oss/sb_audio.c linux-2.6.32.39/sound/os= s/sb_audio.c +--- linux-2.6.32.39/sound/oss/sb_audio.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.39/sound/oss/sb_audio.c 2011-04-17 15:56:46.000000000 -= 0400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 =3D (signed short *)(localbuf + localoffs); while (c) @@ -63252,9 +61027,9 @@ diff -urNp linux-2.6.32.38/sound/oss/sb_audio.c l= inux-2.6.32.38/sound/oss/sb_aud if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.32.38/sound/oss/swarm_cs4297a.c linux-2.6.32.38/sou= nd/oss/swarm_cs4297a.c ---- linux-2.6.32.38/sound/oss/swarm_cs4297a.c 2011-03-27 14:31:47.000000= 000 -0400 -+++ linux-2.6.32.38/sound/oss/swarm_cs4297a.c 2011-04-17 15:56:46.000000= 000 -0400 +diff -urNp linux-2.6.32.39/sound/oss/swarm_cs4297a.c linux-2.6.32.39/sou= nd/oss/swarm_cs4297a.c +--- linux-2.6.32.39/sound/oss/swarm_cs4297a.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.39/sound/oss/swarm_cs4297a.c 2011-04-17 15:56:46.000000= 000 -0400 @@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void) { struct cs4297a_state *s; @@ -63289,9 +61064,9 @@ diff -urNp linux-2.6.32.38/sound/oss/swarm_cs4297= a.c linux-2.6.32.38/sound/oss/s =20 list_add(&s->list, &cs4297a_devs); =20 -diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_codec.c linux-2.6.32.38/s= ound/pci/ac97/ac97_codec.c ---- linux-2.6.32.38/sound/pci/ac97/ac97_codec.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/sound/pci/ac97/ac97_codec.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/sound/pci/ac97/ac97_codec.c linux-2.6.32.39/s= ound/pci/ac97/ac97_codec.c +--- linux-2.6.32.39/sound/pci/ac97/ac97_codec.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/sound/pci/ac97/ac97_codec.c 2011-04-17 15:56:46.0000= 00000 -0400 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } =20 @@ -63301,9 +61076,9 @@ diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_co= dec.c linux-2.6.32.38/sound/pci =20 #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) -diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_patch.c linux-2.6.32.38/s= ound/pci/ac97/ac97_patch.c ---- linux-2.6.32.38/sound/pci/ac97/ac97_patch.c 2011-03-27 14:31:47.0000= 00000 -0400 -+++ linux-2.6.32.38/sound/pci/ac97/ac97_patch.c 2011-04-17 15:56:46.0000= 00000 -0400 +diff -urNp linux-2.6.32.39/sound/pci/ac97/ac97_patch.c linux-2.6.32.39/s= ound/pci/ac97/ac97_patch.c +--- linux-2.6.32.39/sound/pci/ac97/ac97_patch.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.39/sound/pci/ac97/ac97_patch.c 2011-04-23 12:56:12.0000= 00000 -0400 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } @@ -63412,15 +61187,6 @@ diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_p= atch.c linux-2.6.32.38/sound/pci .build_spdif =3D patch_conexant_build_spdif }; =20 -@@ -1501,7 +1501,7 @@ static const struct snd_ac97_res_table a - { AC97_VIDEO, 0x9f1f }, - { AC97_AUX, 0x9f1f }, - { AC97_PCM, 0x9f1f }, -- { } /* terminator */ -+ { 0, 0 } /* terminator */ - }; -=20 - static int patch_ad1819(struct snd_ac97 * ac97) @@ -1575,7 +1575,7 @@ static void patch_ad1881_chained(struct=20 } } @@ -63592,15 +61358,6 @@ diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_p= atch.c linux-2.6.32.38/sound/pci .build_specific =3D patch_si3036_specific, }; =20 -@@ -3879,7 +3879,7 @@ static struct snd_ac97_res_table lm4550_ - { AC97_AUX, 0x1f1f }, - { AC97_PCM, 0x1f1f }, - { AC97_REC_GAIN, 0x0f0f }, -- { } /* terminator */ -+ { 0, 0 } /* terminator */ - }; -=20 - static int patch_lm4550(struct snd_ac97 *ac97) @@ -3913,7 +3913,7 @@ static int patch_ucb1400_specific(struct return 0; } @@ -63610,21 +61367,9 @@ diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_p= atch.c linux-2.6.32.38/sound/pci .build_specific =3D patch_ucb1400_specific, }; =20 -diff -urNp linux-2.6.32.38/sound/pci/ens1370.c linux-2.6.32.38/sound/pci= /ens1370.c ---- linux-2.6.32.38/sound/pci/ens1370.c 2011-04-17 17:00:52.000000000 -0= 400 -+++ linux-2.6.32.38/sound/pci/ens1370.c 2011-04-17 17:04:47.000000000 -0= 400 -@@ -453,7 +453,7 @@ static struct pci_device_id snd_audiopci - { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ - { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ - #endif -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.32.38/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.= 38/sound/pci/hda/patch_intelhdmi.c ---- linux-2.6.32.38/sound/pci/hda/patch_intelhdmi.c 2011-03-27 14:31:47.= 000000000 -0400 -+++ linux-2.6.32.38/sound/pci/hda/patch_intelhdmi.c 2011-04-17 15:56:46.= 000000000 -0400 +diff -urNp linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.= 39/sound/pci/hda/patch_intelhdmi.c +--- linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c 2011-04-17 15:56:46.= 000000000 -0400 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str cp_ready); =20 @@ -63640,51 +61385,21 @@ diff -urNp linux-2.6.32.38/sound/pci/hda/patch_= intelhdmi.c linux-2.6.32.38/sound } =20 =20 -diff -urNp linux-2.6.32.38/sound/pci/intel8x0.c linux-2.6.32.38/sound/pc= i/intel8x0.c ---- linux-2.6.32.38/sound/pci/intel8x0.c 2011-03-27 14:31:47.000000000 -= 0400 -+++ linux-2.6.32.38/sound/pci/intel8x0.c 2011-04-17 15:56:46.000000000 -= 0400 -@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 - { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ - { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ - { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids); -@@ -2135,7 +2135,7 @@ static struct ac97_quirk ac97_quirks[] _ - .type =3D AC97_TUNE_HP_ONLY - }, - #endif -- { } /* terminator */ -+ { 0, 0, 0, 0, NULL, 0 } /* terminator */ - }; -=20 - static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97= _clock, -diff -urNp linux-2.6.32.38/sound/pci/intel8x0m.c linux-2.6.32.38/sound/p= ci/intel8x0m.c ---- linux-2.6.32.38/sound/pci/intel8x0m.c 2011-03-27 14:31:47.000000000 = -0400 -+++ linux-2.6.32.38/sound/pci/intel8x0m.c 2011-04-17 15:56:46.000000000 = -0400 -@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 - { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ - { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ - #endif -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, snd_intel8x0m_ids); +diff -urNp linux-2.6.32.39/sound/pci/intel8x0m.c linux-2.6.32.39/sound/p= ci/intel8x0m.c +--- linux-2.6.32.39/sound/pci/intel8x0m.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.39/sound/pci/intel8x0m.c 2011-04-23 12:56:12.000000000 = -0400 @@ -1264,7 +1264,7 @@ static struct shortname_table { { 0x5455, "ALi M5455" }, { 0x746d, "AMD AMD8111" }, #endif - { 0 }, -+ { 0, NULL }, ++ { 0, }, }; =20 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.32.38/usr/gen_init_cpio.c linux-2.6.32.38/usr/gen_i= nit_cpio.c ---- linux-2.6.32.38/usr/gen_init_cpio.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/usr/gen_init_cpio.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/usr/gen_init_cpio.c linux-2.6.32.39/usr/gen_i= nit_cpio.c +--- linux-2.6.32.39/usr/gen_init_cpio.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/usr/gen_init_cpio.c 2011-04-17 15:56:46.000000000 -0= 400 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; int rc =3D -1; @@ -63707,9 +61422,9 @@ diff -urNp linux-2.6.32.38/usr/gen_init_cpio.c li= nux-2.6.32.38/usr/gen_init_cpio } else break; } -diff -urNp linux-2.6.32.38/virt/kvm/kvm_main.c linux-2.6.32.38/virt/kvm/= kvm_main.c ---- linux-2.6.32.38/virt/kvm/kvm_main.c 2011-03-27 14:31:47.000000000 -0= 400 -+++ linux-2.6.32.38/virt/kvm/kvm_main.c 2011-04-17 15:56:46.000000000 -0= 400 +diff -urNp linux-2.6.32.39/virt/kvm/kvm_main.c linux-2.6.32.39/virt/kvm/= kvm_main.c +--- linux-2.6.32.39/virt/kvm/kvm_main.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.39/virt/kvm/kvm_main.c 2011-04-23 21:41:37.000000000 -0= 400 @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode return 0; } @@ -63734,17 +61449,7 @@ diff -urNp linux-2.6.32.38/virt/kvm/kvm_main.c l= inux-2.6.32.38/virt/kvm/kvm_main static struct file_operations kvm_chardev_ops =3D { .unlocked_ioctl =3D kvm_dev_ioctl, .compat_ioctl =3D kvm_dev_ioctl, -@@ -2440,6 +2443,9 @@ static struct miscdevice kvm_dev =3D { - KVM_MINOR, - "kvm", - &kvm_chardev_ops, -+ {NULL, NULL}, -+ NULL, -+ NULL - }; -=20 - static void hardware_enable(void *junk) -@@ -2494,7 +2500,7 @@ asmlinkage void kvm_handle_fault_on_rebo +@@ -2494,7 +2497,7 @@ asmlinkage void kvm_handle_fault_on_rebo if (kvm_rebooting) /* spin while reset goes on */ while (true) @@ -63753,7 +61458,7 @@ diff -urNp linux-2.6.32.38/virt/kvm/kvm_main.c li= nux-2.6.32.38/virt/kvm/kvm_main /* Fault while not rebooting. We want the trace. */ BUG(); } -@@ -2714,7 +2720,7 @@ static void kvm_sched_out(struct preempt +@@ -2714,7 +2717,7 @@ static void kvm_sched_out(struct preempt kvm_arch_vcpu_put(vcpu); } =20 @@ -63762,3 +61467,12 @@ diff -urNp linux-2.6.32.38/virt/kvm/kvm_main.c l= inux-2.6.32.38/virt/kvm/kvm_main struct module *module) { int r; +@@ -2767,7 +2770,7 @@ int kvm_init(void *opaque, unsigned int=20 + /* A kmem cache lets us meet the alignment requirements of fx_save. */ + kvm_vcpu_cache =3D kmem_cache_create("kvm_vcpu", vcpu_size, + __alignof__(struct kvm_vcpu), +- 0, NULL); ++ SLAB_USERCOPY, NULL); + if (!kvm_vcpu_cache) { + r =3D -ENOMEM; + goto out_free_5; diff --git a/2.6.32/4422_grsec-mute-warnings.patch b/2.6.32/4422_grsec-mu= te-warnings.patch index 90d934d..e1915d9 100644 --- a/2.6.32/4422_grsec-mute-warnings.patch +++ b/2.6.32/4422_grsec-mute-warnings.patch @@ -1,3 +1,10 @@ +From: Anthony G. Basile +Updated patch for 2.6.32.39. + +The credits/description from the original version of this patch remain a= ccurate +and are included below. + +--- From: Jory A. Pratt Updated patch for kernel 2.6.32 =20 @@ -22,14 +29,14 @@ warning flags of vanilla kernel versions. Acked-by: Christian Heim --- =20 ---- a/Makefile 2009-07-29 05:34:01.695857499 +0100 -+++ b/Makefile 2009-07-29 05:58:15.098857201 +0100 +--- a/Makefile 2011-04-27 22:52:14.000000000 -0400 ++++ b/Makefile 2011-04-27 23:01:48.000000000 -0400 @@ -221,7 +221,7 @@ =20 HOSTCC =3D gcc HOSTCXX =3D g++ --HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 = -fomit-frame-pointer -fno-delete-null-pointer-checks -+HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fo= mit-frame-pointer -fno-delete-null-pointer-checks +-HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-mi= ssing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointe= r-checks ++HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-em= pty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missi= ng-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-c= hecks HOSTCXXFLAGS =3D -O2 -fno-delete-null-pointer-checks =20 # Decide whether to build built-in, modular, or both. diff --git a/2.6.38/0000_README b/2.6.38/0000_README index c24fae2..63831b6 100644 --- a/2.6.38/0000_README +++ b/2.6.38/0000_README @@ -3,7 +3,7 @@ README =20 Individual Patch Descriptions: ------------------------------------------------------------------------= ----- -Patch: 4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch +Patch: 4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity =20 diff --git a/2.6.38/4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch b/2= .6.38/4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch similarity index 84% rename from 2.6.38/4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch rename to 2.6.38/4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch index 15f7d14..10b27e8 100644 --- a/2.6.38/4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch +++ b/2.6.38/4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.38.3/arch/alpha/include/asm/dma-mapping.h linux-2.6= .38.3/arch/alpha/include/asm/dma-mapping.h ---- linux-2.6.38.3/arch/alpha/include/asm/dma-mapping.h 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/alpha/include/asm/dma-mapping.h 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h linux-2.6= .38.4/arch/alpha/include/asm/dma-mapping.h +--- linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h 2011-04-17 15:57= :32.000000000 -0400 @@ -3,9 +3,9 @@ =20 #include @@ -13,9 +13,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/include/asm/dma-ma= pping.h linux-2.6.38.3/ar { return dma_ops; } -diff -urNp linux-2.6.38.3/arch/alpha/include/asm/elf.h linux-2.6.38.3/ar= ch/alpha/include/asm/elf.h ---- linux-2.6.38.3/arch/alpha/include/asm/elf.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/alpha/include/asm/elf.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/alpha/include/asm/elf.h linux-2.6.38.4/ar= ch/alpha/include/asm/elf.h +--- linux-2.6.38.4/arch/alpha/include/asm/elf.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/alpha/include/asm/elf.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -30,9 +30,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/include/asm/elf.h = linux-2.6.38.3/arch/alpha /* $0 is set by ld.so to a pointer to a function which might be=20 registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.38.3/arch/alpha/include/asm/pgtable.h linux-2.6.38.= 3/arch/alpha/include/asm/pgtable.h ---- linux-2.6.38.3/arch/alpha/include/asm/pgtable.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/alpha/include/asm/pgtable.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/alpha/include/asm/pgtable.h linux-2.6.38.= 4/arch/alpha/include/asm/pgtable.h +--- linux-2.6.38.4/arch/alpha/include/asm/pgtable.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/alpha/include/asm/pgtable.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -101,6 +101,17 @@ struct vm_area_struct; #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) @@ -51,9 +51,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/include/asm/pgtabl= e.h linux-2.6.38.3/arch/a #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAG= E_KWE) =20 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.38.3/arch/alpha/kernel/module.c linux-2.6.38.3/arch= /alpha/kernel/module.c ---- linux-2.6.38.3/arch/alpha/kernel/module.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/alpha/kernel/module.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/alpha/kernel/module.c linux-2.6.38.4/arch= /alpha/kernel/module.c +--- linux-2.6.38.4/arch/alpha/kernel/module.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/alpha/kernel/module.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,=20 =20 /* The small sections were sorted to the end of the segment. @@ -63,9 +63,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/kernel/module.c li= nux-2.6.38.3/arch/alpha/k got =3D sechdrs[me->arch.gotsecindex].sh_addr; =20 for (i =3D 0; i < n; i++) { -diff -urNp linux-2.6.38.3/arch/alpha/kernel/osf_sys.c linux-2.6.38.3/arc= h/alpha/kernel/osf_sys.c ---- linux-2.6.38.3/arch/alpha/kernel/osf_sys.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/alpha/kernel/osf_sys.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/alpha/kernel/osf_sys.c linux-2.6.38.4/arc= h/alpha/kernel/osf_sys.c +--- linux-2.6.38.4/arch/alpha/kernel/osf_sys.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/alpha/kernel/osf_sys.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -1162,7 +1162,7 @@ arch_get_unmapped_area_1(unsigned long a /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) @@ -97,9 +97,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/kernel/osf_sys.c l= inux-2.6.38.3/arch/alpha/ if (addr !=3D (unsigned long) -ENOMEM) return addr; =20 -diff -urNp linux-2.6.38.3/arch/alpha/kernel/pci_iommu.c linux-2.6.38.3/a= rch/alpha/kernel/pci_iommu.c ---- linux-2.6.38.3/arch/alpha/kernel/pci_iommu.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/alpha/kernel/pci_iommu.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c linux-2.6.38.4/a= rch/alpha/kernel/pci_iommu.c +--- linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev return 0; } @@ -116,9 +116,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/kernel/pci_iommu= .c linux-2.6.38.3/arch/alph -struct dma_map_ops *dma_ops =3D &alpha_pci_ops; +const struct dma_map_ops *dma_ops =3D &alpha_pci_ops; EXPORT_SYMBOL(dma_ops); -diff -urNp linux-2.6.38.3/arch/alpha/kernel/pci-noop.c linux-2.6.38.3/ar= ch/alpha/kernel/pci-noop.c ---- linux-2.6.38.3/arch/alpha/kernel/pci-noop.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/alpha/kernel/pci-noop.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci-noop.c linux-2.6.38.4/ar= ch/alpha/kernel/pci-noop.c +--- linux-2.6.38.4/arch/alpha/kernel/pci-noop.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/alpha/kernel/pci-noop.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de return 0; } @@ -137,9 +137,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/kernel/pci-noop.= c linux-2.6.38.3/arch/alpha EXPORT_SYMBOL(dma_ops); =20 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max= len) -diff -urNp linux-2.6.38.3/arch/alpha/mm/fault.c linux-2.6.38.3/arch/alph= a/mm/fault.c ---- linux-2.6.38.3/arch/alpha/mm/fault.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/alpha/mm/fault.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/alpha/mm/fault.c linux-2.6.38.4/arch/alph= a/mm/fault.c +--- linux-2.6.38.4/arch/alpha/mm/fault.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/alpha/mm/fault.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -296,9 +296,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/mm/fault.c linux= -2.6.38.3/arch/alpha/mm/fau } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.38.3/arch/arm/include/asm/elf.h linux-2.6.38.3/arch= /arm/include/asm/elf.h ---- linux-2.6.38.3/arch/arm/include/asm/elf.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/arm/include/asm/elf.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/arm/include/asm/elf.h linux-2.6.38.4/arch= /arm/include/asm/elf.h +--- linux-2.6.38.4/arch/arm/include/asm/elf.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/arm/include/asm/elf.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -326,9 +326,9 @@ diff -urNp linux-2.6.38.3/arch/arm/include/asm/elf.h = linux-2.6.38.3/arch/arm/inc extern int vectors_user_mapping(void); #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_map= ping() #define ARCH_HAS_SETUP_ADDITIONAL_PAGES -diff -urNp linux-2.6.38.3/arch/arm/include/asm/kmap_types.h linux-2.6.38= .3/arch/arm/include/asm/kmap_types.h ---- linux-2.6.38.3/arch/arm/include/asm/kmap_types.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/arm/include/asm/kmap_types.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/arm/include/asm/kmap_types.h linux-2.6.38= .4/arch/arm/include/asm/kmap_types.h +--- linux-2.6.38.4/arch/arm/include/asm/kmap_types.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/arm/include/asm/kmap_types.h 2011-04-17 15:57:32= .000000000 -0400 @@ -21,6 +21,7 @@ enum km_type { KM_L1_CACHE, KM_L2_CACHE, @@ -337,9 +337,9 @@ diff -urNp linux-2.6.38.3/arch/arm/include/asm/kmap_t= ypes.h linux-2.6.38.3/arch/ KM_TYPE_NR }; =20 -diff -urNp linux-2.6.38.3/arch/arm/include/asm/uaccess.h linux-2.6.38.3/= arch/arm/include/asm/uaccess.h ---- linux-2.6.38.3/arch/arm/include/asm/uaccess.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/arm/include/asm/uaccess.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/arm/include/asm/uaccess.h linux-2.6.38.4/= arch/arm/include/asm/uaccess.h +--- linux-2.6.38.4/arch/arm/include/asm/uaccess.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/arm/include/asm/uaccess.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn =20 static inline unsigned long __must_check copy_from_user(void *to, const= void __user *from, unsigned long n) @@ -360,9 +360,9 @@ diff -urNp linux-2.6.38.3/arch/arm/include/asm/uacces= s.h linux-2.6.38.3/arch/arm if (access_ok(VERIFY_WRITE, to, n)) n =3D __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.38.3/arch/arm/kernel/kgdb.c linux-2.6.38.3/arch/arm= /kernel/kgdb.c ---- linux-2.6.38.3/arch/arm/kernel/kgdb.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/arm/kernel/kgdb.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/arm/kernel/kgdb.c linux-2.6.38.4/arch/arm= /kernel/kgdb.c +--- linux-2.6.38.4/arch/arm/kernel/kgdb.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/arm/kernel/kgdb.c 2011-04-17 15:57:32.000000000 = -0400 @@ -246,7 +246,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -372,9 +372,9 @@ diff -urNp linux-2.6.38.3/arch/arm/kernel/kgdb.c linu= x-2.6.38.3/arch/arm/kernel/ #ifndef __ARMEB__ .gdb_bpt_instr =3D {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.38.3/arch/arm/kernel/process.c linux-2.6.38.3/arch/= arm/kernel/process.c ---- linux-2.6.38.3/arch/arm/kernel/process.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/arm/kernel/process.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/arm/kernel/process.c linux-2.6.38.4/arch/= arm/kernel/process.c +--- linux-2.6.38.4/arch/arm/kernel/process.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/arm/kernel/process.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -28,7 +28,6 @@ #include #include @@ -396,9 +396,9 @@ diff -urNp linux-2.6.38.3/arch/arm/kernel/process.c l= inux-2.6.38.3/arch/arm/kern #ifdef CONFIG_MMU /* * The vectors page is always readable from user space for the -diff -urNp linux-2.6.38.3/arch/arm/mach-msm/last_radio_log.c linux-2.6.3= 8.3/arch/arm/mach-msm/last_radio_log.c ---- linux-2.6.38.3/arch/arm/mach-msm/last_radio_log.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/arm/mach-msm/last_radio_log.c 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c linux-2.6.3= 8.4/arch/arm/mach-msm/last_radio_log.c +--- linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c 2011-04-17 15:57:3= 2.000000000 -0400 @@ -47,7 +47,7 @@ static ssize_t last_radio_log_read(struc return count; } @@ -408,9 +408,9 @@ diff -urNp linux-2.6.38.3/arch/arm/mach-msm/last_radi= o_log.c linux-2.6.38.3/arch .read =3D last_radio_log_read, .llseek =3D default_llseek, }; -diff -urNp linux-2.6.38.3/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38= .3/arch/arm/mach-ux500/mbox-db5500.c ---- linux-2.6.38.3/arch/arm/mach-ux500/mbox-db5500.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/arm/mach-ux500/mbox-db5500.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38= .4/arch/arm/mach-ux500/mbox-db5500.c +--- linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c 2011-04-17 15:57:32= .000000000 -0400 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev return sprintf(buf, "0x%X\n", mbox_value); } @@ -420,9 +420,9 @@ diff -urNp linux-2.6.38.3/arch/arm/mach-ux500/mbox-db= 5500.c linux-2.6.38.3/arch/ =20 static int mbox_show(struct seq_file *s, void *data) { -diff -urNp linux-2.6.38.3/arch/arm/mm/fault.c linux-2.6.38.3/arch/arm/mm= /fault.c ---- linux-2.6.38.3/arch/arm/mm/fault.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/arch/arm/mm/fault.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/arch/arm/mm/fault.c linux-2.6.38.4/arch/arm/mm= /fault.c +--- linux-2.6.38.4/arch/arm/mm/fault.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/arch/arm/mm/fault.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -471,9 +471,9 @@ diff -urNp linux-2.6.38.3/arch/arm/mm/fault.c linux-2= .6.38.3/arch/arm/mm/fault.c /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.38.3/arch/arm/mm/mmap.c linux-2.6.38.3/arch/arm/mm/= mmap.c ---- linux-2.6.38.3/arch/arm/mm/mmap.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/arch/arm/mm/mmap.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/arch/arm/mm/mmap.c linux-2.6.38.4/arch/arm/mm/= mmap.c +--- linux-2.6.38.4/arch/arm/mm/mmap.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/arch/arm/mm/mmap.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -523,9 +523,9 @@ diff -urNp linux-2.6.38.3/arch/arm/mm/mmap.c linux-2.= 6.38.3/arch/arm/mm/mmap.c /* * Remember the place where we stopped the search: */ -diff -urNp linux-2.6.38.3/arch/avr32/include/asm/elf.h linux-2.6.38.3/ar= ch/avr32/include/asm/elf.h ---- linux-2.6.38.3/arch/avr32/include/asm/elf.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/avr32/include/asm/elf.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/avr32/include/asm/elf.h linux-2.6.38.4/ar= ch/avr32/include/asm/elf.h +--- linux-2.6.38.4/arch/avr32/include/asm/elf.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/avr32/include/asm/elf.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -542,9 +542,9 @@ diff -urNp linux-2.6.38.3/arch/avr32/include/asm/elf.= h linux-2.6.38.3/arch/avr32 =20 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space= , -diff -urNp linux-2.6.38.3/arch/avr32/include/asm/kmap_types.h linux-2.6.= 38.3/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.38.3/arch/avr32/include/asm/kmap_types.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h linux-2.6.= 38.4/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -555,9 +555,9 @@ diff -urNp linux-2.6.38.3/arch/avr32/include/asm/kmap= _types.h linux-2.6.38.3/arc }; =20 #undef D -diff -urNp linux-2.6.38.3/arch/avr32/mm/fault.c linux-2.6.38.3/arch/avr3= 2/mm/fault.c ---- linux-2.6.38.3/arch/avr32/mm/fault.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/avr32/mm/fault.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/avr32/mm/fault.c linux-2.6.38.4/arch/avr3= 2/mm/fault.c +--- linux-2.6.38.4/arch/avr32/mm/fault.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/avr32/mm/fault.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru =20 int exception_trace =3D 1; @@ -599,9 +599,9 @@ diff -urNp linux-2.6.38.3/arch/avr32/mm/fault.c linux= -2.6.38.3/arch/avr32/mm/fau if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.38.3/arch/blackfin/kernel/kgdb.c linux-2.6.38.3/arc= h/blackfin/kernel/kgdb.c ---- linux-2.6.38.3/arch/blackfin/kernel/kgdb.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/blackfin/kernel/kgdb.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/blackfin/kernel/kgdb.c linux-2.6.38.4/arc= h/blackfin/kernel/kgdb.c +--- linux-2.6.38.4/arch/blackfin/kernel/kgdb.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/blackfin/kernel/kgdb.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vecto return -1; /* this means that we do not want to exit from the handler= */ } @@ -611,9 +611,9 @@ diff -urNp linux-2.6.38.3/arch/blackfin/kernel/kgdb.c= linux-2.6.38.3/arch/blackf .gdb_bpt_instr =3D {0xa1}, #ifdef CONFIG_SMP .flags =3D KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.38.3/arch/blackfin/mm/maccess.c linux-2.6.38.3/arch= /blackfin/mm/maccess.c ---- linux-2.6.38.3/arch/blackfin/mm/maccess.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/blackfin/mm/maccess.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/blackfin/mm/maccess.c linux-2.6.38.4/arch= /blackfin/mm/maccess.c +--- linux-2.6.38.4/arch/blackfin/mm/maccess.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/blackfin/mm/maccess.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -16,7 +16,7 @@ static int validate_memory_access_addres return bfin_mem_access_type(addr, size); } @@ -632,9 +632,9 @@ diff -urNp linux-2.6.38.3/arch/blackfin/mm/maccess.c = linux-2.6.38.3/arch/blackfi { unsigned long ldst =3D (unsigned long)dst; int mem_type; -diff -urNp linux-2.6.38.3/arch/frv/include/asm/kmap_types.h linux-2.6.38= .3/arch/frv/include/asm/kmap_types.h ---- linux-2.6.38.3/arch/frv/include/asm/kmap_types.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/frv/include/asm/kmap_types.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/frv/include/asm/kmap_types.h linux-2.6.38= .4/arch/frv/include/asm/kmap_types.h +--- linux-2.6.38.4/arch/frv/include/asm/kmap_types.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/frv/include/asm/kmap_types.h 2011-04-17 15:57:32= .000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -643,9 +643,9 @@ diff -urNp linux-2.6.38.3/arch/frv/include/asm/kmap_t= ypes.h linux-2.6.38.3/arch/ KM_TYPE_NR }; =20 -diff -urNp linux-2.6.38.3/arch/frv/mm/elf-fdpic.c linux-2.6.38.3/arch/fr= v/mm/elf-fdpic.c ---- linux-2.6.38.3/arch/frv/mm/elf-fdpic.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/frv/mm/elf-fdpic.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/frv/mm/elf-fdpic.c linux-2.6.38.4/arch/fr= v/mm/elf-fdpic.c +--- linux-2.6.38.4/arch/frv/mm/elf-fdpic.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/frv/mm/elf-fdpic.c 2011-04-17 15:57:32.000000000= -0400 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str if (addr) { addr =3D PAGE_ALIGN(addr); @@ -674,9 +674,9 @@ diff -urNp linux-2.6.38.3/arch/frv/mm/elf-fdpic.c lin= ux-2.6.38.3/arch/frv/mm/elf goto success; addr =3D vma->vm_end; } -diff -urNp linux-2.6.38.3/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.= 3/arch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.38.3/arch/ia64/hp/common/hwsw_iommu.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.= 4/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -17,7 +17,7 @@ #include #include @@ -695,9 +695,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/hp/common/hwsw_io= mmu.c linux-2.6.38.3/arch/i { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.38.3/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.3= /arch/ia64/hp/common/sba_iommu.c ---- linux-2.6.38.3/arch/ia64/hp/common/sba_iommu.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.4= /arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -716,9 +716,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/hp/common/sba_iom= mu.c linux-2.6.38.3/arch/ia .alloc_coherent =3D sba_alloc_coherent, .free_coherent =3D sba_free_coherent, .map_page =3D sba_map_page, -diff -urNp linux-2.6.38.3/arch/ia64/include/asm/dma-mapping.h linux-2.6.= 38.3/arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.38.3/arch/ia64/include/asm/dma-mapping.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h linux-2.6.= 38.4/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -12,7 +12,7 @@ =20 #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -762,9 +762,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/dma-m= apping.h linux-2.6.38.3/arc return ops->dma_supported(dev, mask); } =20 -diff -urNp linux-2.6.38.3/arch/ia64/include/asm/elf.h linux-2.6.38.3/arc= h/ia64/include/asm/elf.h ---- linux-2.6.38.3/arch/ia64/include/asm/elf.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/ia64/include/asm/elf.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/include/asm/elf.h linux-2.6.38.4/arc= h/ia64/include/asm/elf.h +--- linux-2.6.38.4/arch/ia64/include/asm/elf.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/ia64/include/asm/elf.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -42,6 +42,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -779,9 +779,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/elf.h= linux-2.6.38.3/arch/ia64/i #define PT_IA_64_UNWIND 0x70000001 =20 /* IA-64 relocations: */ -diff -urNp linux-2.6.38.3/arch/ia64/include/asm/machvec.h linux-2.6.38.3= /arch/ia64/include/asm/machvec.h ---- linux-2.6.38.3/arch/ia64/include/asm/machvec.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/ia64/include/asm/machvec.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/include/asm/machvec.h linux-2.6.38.4= /arch/ia64/include/asm/machvec.h +--- linux-2.6.38.4/arch/ia64/include/asm/machvec.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/ia64/include/asm/machvec.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -800,9 +800,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/machv= ec.h linux-2.6.38.3/arch/ia =20 /* * Define default versions so we can extend machvec for new platforms w= ithout having -diff -urNp linux-2.6.38.3/arch/ia64/include/asm/pgtable.h linux-2.6.38.3= /arch/ia64/include/asm/pgtable.h ---- linux-2.6.38.3/arch/ia64/include/asm/pgtable.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/ia64/include/asm/pgtable.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/include/asm/pgtable.h linux-2.6.38.4= /arch/ia64/include/asm/pgtable.h +--- linux-2.6.38.4/arch/ia64/include/asm/pgtable.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/ia64/include/asm/pgtable.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -12,7 +12,7 @@ * David Mosberger-Tang */ @@ -830,9 +830,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/pgtab= le.h linux-2.6.38.3/arch/ia #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX= ) -diff -urNp linux-2.6.38.3/arch/ia64/include/asm/spinlock.h linux-2.6.38.= 3/arch/ia64/include/asm/spinlock.h ---- linux-2.6.38.3/arch/ia64/include/asm/spinlock.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/ia64/include/asm/spinlock.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/include/asm/spinlock.h linux-2.6.38.= 4/arch/ia64/include/asm/spinlock.h +--- linux-2.6.38.4/arch/ia64/include/asm/spinlock.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/ia64/include/asm/spinlock.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi unsigned short *p =3D (unsigned short *)&lock->lock + 1, tmp; =20 @@ -842,9 +842,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/spinl= ock.h linux-2.6.38.3/arch/i } =20 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *= lock) -diff -urNp linux-2.6.38.3/arch/ia64/include/asm/uaccess.h linux-2.6.38.3= /arch/ia64/include/asm/uaccess.h ---- linux-2.6.38.3/arch/ia64/include/asm/uaccess.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/ia64/include/asm/uaccess.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/include/asm/uaccess.h linux-2.6.38.4= /arch/ia64/include/asm/uaccess.h +--- linux-2.6.38.4/arch/ia64/include/asm/uaccess.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/ia64/include/asm/uaccess.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from =3D (from); \ long __cu_len =3D (n); \ @@ -863,9 +863,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/uacce= ss.h linux-2.6.38.3/arch/ia __cu_len =3D __copy_user((__force void __user *) __cu_to, __cu_from, = __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.38.3/arch/ia64/kernel/dma-mapping.c linux-2.6.38.3/= arch/ia64/kernel/dma-mapping.c ---- linux-2.6.38.3/arch/ia64/kernel/dma-mapping.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c linux-2.6.38.4/= arch/ia64/kernel/dma-mapping.c +--- linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -884,9 +884,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/dma-mappin= g.c linux-2.6.38.3/arch/ia6 { return dma_ops; } -diff -urNp linux-2.6.38.3/arch/ia64/kernel/module.c linux-2.6.38.3/arch/= ia64/kernel/module.c ---- linux-2.6.38.3/arch/ia64/kernel/module.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/ia64/kernel/module.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/kernel/module.c linux-2.6.38.4/arch/= ia64/kernel/module.c +--- linux-2.6.38.4/arch/ia64/kernel/module.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/ia64/kernel/module.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -975,9 +975,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/module.c l= inux-2.6.38.3/arch/ia64/ker mod->arch.gp =3D gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.38.3/arch/ia64/kernel/pci-dma.c linux-2.6.38.3/arch= /ia64/kernel/pci-dma.c ---- linux-2.6.38.3/arch/ia64/kernel/pci-dma.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/ia64/kernel/pci-dma.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-dma.c linux-2.6.38.4/arch= /ia64/kernel/pci-dma.c +--- linux-2.6.38.4/arch/ia64/kernel/pci-dma.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/ia64/kernel/pci-dma.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -43,7 +43,7 @@ struct device fallback_dev =3D { .dma_mask =3D &fallback_dev.coherent_dma_mask, }; @@ -987,9 +987,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/pci-dma.c = linux-2.6.38.3/arch/ia64/ke =20 static int __init pci_iommu_init(void) { -diff -urNp linux-2.6.38.3/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.3/= arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.38.3/arch/ia64/kernel/pci-swiotlb.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.4/= arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -999,9 +999,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/pci-swiotl= b.c linux-2.6.38.3/arch/ia6 .alloc_coherent =3D ia64_swiotlb_alloc_coherent, .free_coherent =3D swiotlb_free_coherent, .map_page =3D swiotlb_map_page, -diff -urNp linux-2.6.38.3/arch/ia64/kernel/sys_ia64.c linux-2.6.38.3/arc= h/ia64/kernel/sys_ia64.c ---- linux-2.6.38.3/arch/ia64/kernel/sys_ia64.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c linux-2.6.38.4/arc= h/ia64/kernel/sys_ia64.c +--- linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) =3D=3D RGN_HPAGE) addr =3D 0; @@ -1034,9 +1034,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/sys_ia64= .c linux-2.6.38.3/arch/ia64/k /* Remember the address where we stopped this search: */ mm->free_area_cache =3D addr + len; return addr; -diff -urNp linux-2.6.38.3/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.3/= arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.38.3/arch/ia64/kernel/vmlinux.lds.S 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.4/= arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:57:32.00= 0000000 -0400 @@ -199,7 +199,7 @@ SECTIONS { /* Per-cpu data: */ . =3D ALIGN(PERCPU_PAGE_SIZE); @@ -1046,9 +1046,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/vmlinux.= lds.S linux-2.6.38.3/arch/ia6 /* * ensure percpu data fits * into percpu page size -diff -urNp linux-2.6.38.3/arch/ia64/mm/fault.c linux-2.6.38.3/arch/ia64/= mm/fault.c ---- linux-2.6.38.3/arch/ia64/mm/fault.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/arch/ia64/mm/fault.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/arch/ia64/mm/fault.c linux-2.6.38.4/arch/ia64/= mm/fault.c +--- linux-2.6.38.4/arch/ia64/mm/fault.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/arch/ia64/mm/fault.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned=20 return pte_present(pte); } @@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/mm/fault.c linu= x-2.6.38.3/arch/ia64/mm/fault /* * If for any reason at all we couldn't handle the fault, make * sure we exit gracefully rather than endlessly redo the -diff -urNp linux-2.6.38.3/arch/ia64/mm/hugetlbpage.c linux-2.6.38.3/arch= /ia64/mm/hugetlbpage.c ---- linux-2.6.38.3/arch/ia64/mm/hugetlbpage.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c linux-2.6.38.4/arch= /ia64/mm/hugetlbpage.c +--- linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area( /* At this point: (!vmm || addr < vmm->vm_end). */ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) @@ -1110,9 +1110,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/mm/hugetlbpage.= c linux-2.6.38.3/arch/ia64/mm return addr; addr =3D ALIGN(vmm->vm_end, HPAGE_SIZE); } -diff -urNp linux-2.6.38.3/arch/ia64/mm/init.c linux-2.6.38.3/arch/ia64/m= m/init.c ---- linux-2.6.38.3/arch/ia64/mm/init.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/arch/ia64/mm/init.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/arch/ia64/mm/init.c linux-2.6.38.4/arch/ia64/m= m/init.c +--- linux-2.6.38.4/arch/ia64/mm/init.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/arch/ia64/mm/init.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -122,6 +122,19 @@ ia64_init_addr_space (void) vma->vm_start =3D current->thread.rbs_bot & PAGE_MASK; vma->vm_end =3D vma->vm_start + PAGE_SIZE; @@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/mm/init.c linux= -2.6.38.3/arch/ia64/mm/init.c vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.3/arch= /ia64/sn/pci/pci_dma.c ---- linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.4/arch= /ia64/sn/pci/pci_dma.c +--- linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1145,9 +1145,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.= c linux-2.6.38.3/arch/ia64/sn .alloc_coherent =3D sn_dma_alloc_coherent, .free_coherent =3D sn_dma_free_coherent, .map_page =3D sn_dma_map_page, -diff -urNp linux-2.6.38.3/arch/m32r/lib/usercopy.c linux-2.6.38.3/arch/m= 32r/lib/usercopy.c ---- linux-2.6.38.3/arch/m32r/lib/usercopy.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/m32r/lib/usercopy.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/m32r/lib/usercopy.c linux-2.6.38.4/arch/m= 32r/lib/usercopy.c +--- linux-2.6.38.4/arch/m32r/lib/usercopy.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/m32r/lib/usercopy.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long= n) @@ -1168,9 +1168,9 @@ diff -urNp linux-2.6.38.3/arch/m32r/lib/usercopy.c = linux-2.6.38.3/arch/m32r/lib/ prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/device.h linux-2.6= .38.3/arch/microblaze/include/asm/device.h ---- linux-2.6.38.3/arch/microblaze/include/asm/device.h 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/microblaze/include/asm/device.h 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/device.h linux-2.6= .38.4/arch/microblaze/include/asm/device.h +--- linux-2.6.38.4/arch/microblaze/include/asm/device.h 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/microblaze/include/asm/device.h 2011-04-17 15:57= :32.000000000 -0400 @@ -13,7 +13,7 @@ struct device_node; =20 struct dev_archdata { @@ -1180,9 +1180,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/include/a= sm/device.h linux-2.6.38.3/ar void *dma_data; }; =20 -diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h linu= x-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h ---- linux-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h 2011-03-14 = 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h 2011-04-17 = 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h linu= x-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h +--- linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h 2011-03-14 = 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h 2011-04-17 = 15:57:32.000000000 -0400 @@ -43,14 +43,14 @@ static inline unsigned long device_to_ma return 0xfffffffful; } @@ -1254,9 +1254,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/include/a= sm/dma-mapping.h linux-2.6.38 =20 BUG_ON(!ops); debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/pci.h linux-2.6.38= .3/arch/microblaze/include/asm/pci.h ---- linux-2.6.38.3/arch/microblaze/include/asm/pci.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/microblaze/include/asm/pci.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/pci.h linux-2.6.38= .4/arch/microblaze/include/asm/pci.h +--- linux-2.6.38.4/arch/microblaze/include/asm/pci.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/microblaze/include/asm/pci.h 2011-04-17 15:57:32= .000000000 -0400 @@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_ } =20 @@ -1268,9 +1268,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/include/a= sm/pci.h linux-2.6.38.3/arch/ #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.38.3/arch/microblaze/kernel/dma.c linux-2.6.38.3/ar= ch/microblaze/kernel/dma.c ---- linux-2.6.38.3/arch/microblaze/kernel/dma.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/microblaze/kernel/dma.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/microblaze/kernel/dma.c linux-2.6.38.4/ar= ch/microblaze/kernel/dma.c +--- linux-2.6.38.4/arch/microblaze/kernel/dma.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/microblaze/kernel/dma.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page __dma_sync_page(dma_address, 0 , size, direction); } @@ -1280,9 +1280,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/kernel/dm= a.c linux-2.6.38.3/arch/micro .alloc_coherent =3D dma_direct_alloc_coherent, .free_coherent =3D dma_direct_free_coherent, .map_sg =3D dma_direct_map_sg, -diff -urNp linux-2.6.38.3/arch/microblaze/kernel/kgdb.c linux-2.6.38.3/a= rch/microblaze/kernel/kgdb.c ---- linux-2.6.38.3/arch/microblaze/kernel/kgdb.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/microblaze/kernel/kgdb.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/microblaze/kernel/kgdb.c linux-2.6.38.4/a= rch/microblaze/kernel/kgdb.c +--- linux-2.6.38.4/arch/microblaze/kernel/kgdb.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/microblaze/kernel/kgdb.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -141,10 +141,11 @@ void kgdb_arch_exit(void) /* * Global data @@ -1296,9 +1296,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/kernel/kg= db.c linux-2.6.38.3/arch/micr .gdb_bpt_instr =3D {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */ #endif }; -diff -urNp linux-2.6.38.3/arch/microblaze/pci/pci-common.c linux-2.6.38.= 3/arch/microblaze/pci/pci-common.c ---- linux-2.6.38.3/arch/microblaze/pci/pci-common.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/microblaze/pci/pci-common.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/microblaze/pci/pci-common.c linux-2.6.38.= 4/arch/microblaze/pci/pci-common.c +--- linux-2.6.38.4/arch/microblaze/pci/pci-common.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/microblaze/pci/pci-common.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -47,14 +47,14 @@ resource_size_t isa_mem_base; /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */ unsigned int pci_flags; @@ -1317,9 +1317,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/pci/pci-c= ommon.c linux-2.6.38.3/arch/m { return pci_dma_ops; } -diff -urNp linux-2.6.38.3/arch/mips/cavium-octeon/dma-octeon.c linux-2.6= .38.3/arch/mips/cavium-octeon/dma-octeon.c ---- linux-2.6.38.3/arch/mips/cavium-octeon/dma-octeon.c 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/mips/cavium-octeon/dma-octeon.c 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c linux-2.6= .38.4/arch/mips/cavium-octeon/dma-octeon.c +--- linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c 2011-04-17 15:57= :32.000000000 -0400 @@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p } =20 @@ -1338,9 +1338,9 @@ diff -urNp linux-2.6.38.3/arch/mips/cavium-octeon/d= ma-octeon.c linux-2.6.38.3/ar =20 void __init octeon_pci_dma_init(void) { -diff -urNp linux-2.6.38.3/arch/mips/include/asm/device.h linux-2.6.38.3/= arch/mips/include/asm/device.h ---- linux-2.6.38.3/arch/mips/include/asm/device.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/mips/include/asm/device.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/include/asm/device.h linux-2.6.38.4/= arch/mips/include/asm/device.h +--- linux-2.6.38.4/arch/mips/include/asm/device.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/mips/include/asm/device.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -10,7 +10,7 @@ struct dma_map_ops; =20 struct dev_archdata { @@ -1350,9 +1350,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/dev= ice.h linux-2.6.38.3/arch/mip }; =20 struct pdev_archdata { -diff -urNp linux-2.6.38.3/arch/mips/include/asm/dma-mapping.h linux-2.6.= 38.3/arch/mips/include/asm/dma-mapping.h ---- linux-2.6.38.3/arch/mips/include/asm/dma-mapping.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/mips/include/asm/dma-mapping.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h linux-2.6.= 38.4/arch/mips/include/asm/dma-mapping.h +--- linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -7,9 +7,9 @@ =20 #include @@ -1399,9 +1399,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/dma= -mapping.h linux-2.6.38.3/arc =20 ops->free_coherent(dev, size, vaddr, dma_handle); =20 -diff -urNp linux-2.6.38.3/arch/mips/include/asm/elf.h linux-2.6.38.3/arc= h/mips/include/asm/elf.h ---- linux-2.6.38.3/arch/mips/include/asm/elf.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/mips/include/asm/elf.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/include/asm/elf.h linux-2.6.38.4/arc= h/mips/include/asm/elf.h +--- linux-2.6.38.4/arch/mips/include/asm/elf.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/mips/include/asm/elf.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -372,13 +372,16 @@ extern const char *__elf_platform; #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1423,9 +1423,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/elf= .h linux-2.6.38.3/arch/mips/i -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-c= oherence.h linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-co= herence.h ---- linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherenc= e.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherenc= e.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-c= oherence.h linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-co= herence.h +--- linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherenc= e.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherenc= e.h 2011-04-17 15:57:32.000000000 -0400 @@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); =20 @@ -1435,9 +1435,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/mac= h-cavium-octeon/dma-coherence extern char *octeon_swiotlb; =20 #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */ -diff -urNp linux-2.6.38.3/arch/mips/include/asm/page.h linux-2.6.38.3/ar= ch/mips/include/asm/page.h ---- linux-2.6.38.3/arch/mips/include/asm/page.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/mips/include/asm/page.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/include/asm/page.h linux-2.6.38.4/ar= ch/mips/include/asm/page.h +--- linux-2.6.38.4/arch/mips/include/asm/page.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/mips/include/asm/page.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; @@ -1447,9 +1447,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/pag= e.h linux-2.6.38.3/arch/mips/ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.38.3/arch/mips/include/asm/system.h linux-2.6.38.3/= arch/mips/include/asm/system.h ---- linux-2.6.38.3/arch/mips/include/asm/system.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/mips/include/asm/system.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/include/asm/system.h linux-2.6.38.4/= arch/mips/include/asm/system.h +--- linux-2.6.38.4/arch/mips/include/asm/system.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/mips/include/asm/system.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1458,9 +1458,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/sys= tem.h linux-2.6.38.3/arch/mip +#define arch_align_stack(x) ((x) & ~0xfUL) =20 #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.38.3/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.= 3/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.38.3/arch/mips/kernel/binfmt_elfn32.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.= 4/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1475,9 +1475,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/binfmt_e= lfn32.c linux-2.6.38.3/arch/m #include #include #include -diff -urNp linux-2.6.38.3/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.= 3/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.38.3/arch/mips/kernel/binfmt_elfo32.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.= 4/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1492,9 +1492,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/binfmt_e= lfo32.c linux-2.6.38.3/arch/m #include =20 /* -diff -urNp linux-2.6.38.3/arch/mips/kernel/kgdb.c linux-2.6.38.3/arch/mi= ps/kernel/kgdb.c ---- linux-2.6.38.3/arch/mips/kernel/kgdb.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/mips/kernel/kgdb.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/mips/kernel/kgdb.c linux-2.6.38.4/arch/mi= ps/kernel/kgdb.c +--- linux-2.6.38.4/arch/mips/kernel/kgdb.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/mips/kernel/kgdb.c 2011-04-17 15:57:32.000000000= -0400 @@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1504,9 +1504,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/kgdb.c l= inux-2.6.38.3/arch/mips/kerne =20 /* * We use kgdb_early_setup so that functions we need to call now don't -diff -urNp linux-2.6.38.3/arch/mips/kernel/process.c linux-2.6.38.3/arch= /mips/kernel/process.c ---- linux-2.6.38.3/arch/mips/kernel/process.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/mips/kernel/process.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/kernel/process.c linux-2.6.38.4/arch= /mips/kernel/process.c +--- linux-2.6.38.4/arch/mips/kernel/process.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/mips/kernel/process.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1523,9 +1523,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/process.= c linux-2.6.38.3/arch/mips/ke - - return sp & ALMASK; -} -diff -urNp linux-2.6.38.3/arch/mips/kernel/syscall.c linux-2.6.38.3/arch= /mips/kernel/syscall.c ---- linux-2.6.38.3/arch/mips/kernel/syscall.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/mips/kernel/syscall.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/kernel/syscall.c linux-2.6.38.4/arch= /mips/kernel/syscall.c +--- linux-2.6.38.4/arch/mips/kernel/syscall.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/mips/kernel/syscall.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str do_color_align =3D 0; if (filp || (flags & MAP_SHARED)) @@ -1576,9 +1576,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/syscall.= c linux-2.6.38.3/arch/mips/ke SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, off_t, offset) -diff -urNp linux-2.6.38.3/arch/mips/mm/dma-default.c linux-2.6.38.3/arch= /mips/mm/dma-default.c ---- linux-2.6.38.3/arch/mips/mm/dma-default.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/mips/mm/dma-default.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/mips/mm/dma-default.c linux-2.6.38.4/arch= /mips/mm/dma-default.c +--- linux-2.6.38.4/arch/mips/mm/dma-default.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/mips/mm/dma-default.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev,=20 =20 EXPORT_SYMBOL(dma_cache_sync); @@ -1597,9 +1597,9 @@ diff -urNp linux-2.6.38.3/arch/mips/mm/dma-default.= c linux-2.6.38.3/arch/mips/mm EXPORT_SYMBOL(mips_dma_map_ops); =20 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) -diff -urNp linux-2.6.38.3/arch/mips/mm/fault.c linux-2.6.38.3/arch/mips/= mm/fault.c ---- linux-2.6.38.3/arch/mips/mm/fault.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/arch/mips/mm/fault.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/arch/mips/mm/fault.c linux-2.6.38.4/arch/mips/= mm/fault.c +--- linux-2.6.38.4/arch/mips/mm/fault.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/arch/mips/mm/fault.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -28,6 +28,23 @@ #include /* For VMALLOC_END */ #include @@ -1624,9 +1624,9 @@ diff -urNp linux-2.6.38.3/arch/mips/mm/fault.c linu= x-2.6.38.3/arch/mips/mm/fault /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.38.3/arch/parisc/include/asm/elf.h linux-2.6.38.3/a= rch/parisc/include/asm/elf.h ---- linux-2.6.38.3/arch/parisc/include/asm/elf.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/parisc/include/asm/elf.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/parisc/include/asm/elf.h linux-2.6.38.4/a= rch/parisc/include/asm/elf.h +--- linux-2.6.38.4/arch/parisc/include/asm/elf.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/parisc/include/asm/elf.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration.. =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1641,9 +1641,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/include/asm/e= lf.h linux-2.6.38.3/arch/pari /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space= , but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.38.3/arch/parisc/include/asm/pgtable.h linux-2.6.38= .3/arch/parisc/include/asm/pgtable.h ---- linux-2.6.38.3/arch/parisc/include/asm/pgtable.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/parisc/include/asm/pgtable.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/parisc/include/asm/pgtable.h linux-2.6.38= .4/arch/parisc/include/asm/pgtable.h +--- linux-2.6.38.4/arch/parisc/include/asm/pgtable.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/parisc/include/asm/pgtable.h 2011-04-17 15:57:32= .000000000 -0400 @@ -209,6 +209,17 @@ struct vm_area_struct; #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_REA= D | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1662,9 +1662,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/include/asm/p= gtable.h linux-2.6.38.3/arch/ #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.38.3/arch/parisc/kernel/module.c linux-2.6.38.3/arc= h/parisc/kernel/module.c ---- linux-2.6.38.3/arch/parisc/kernel/module.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/parisc/kernel/module.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/parisc/kernel/module.c linux-2.6.38.4/arc= h/parisc/kernel/module.c +--- linux-2.6.38.4/arch/parisc/kernel/module.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/parisc/kernel/module.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -96,16 +96,38 @@ =20 /* three functions to determine where in the module core @@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/kernel/module= .c linux-2.6.38.3/arch/parisc =20 DEBUGP("register_unwind_table(), sect =3D %d at 0x%p - 0x%p (gp=3D0x%l= x)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.38.3/arch/parisc/kernel/sys_parisc.c linux-2.6.38.3= /arch/parisc/kernel/sys_parisc.c ---- linux-2.6.38.3/arch/parisc/kernel/sys_parisc.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c linux-2.6.38.4= /arch/parisc/kernel/sys_parisc.c +--- linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) @@ -1795,9 +1795,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/kernel/sys_pa= risc.c linux-2.6.38.3/arch/pa =20 if (filp) { addr =3D get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.38.3/arch/parisc/kernel/traps.c linux-2.6.38.3/arch= /parisc/kernel/traps.c ---- linux-2.6.38.3/arch/parisc/kernel/traps.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/parisc/kernel/traps.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/parisc/kernel/traps.c linux-2.6.38.4/arch= /parisc/kernel/traps.c +--- linux-2.6.38.4/arch/parisc/kernel/traps.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/parisc/kernel/traps.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod =20 down_read(¤t->mm->mmap_sem); @@ -1809,9 +1809,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/kernel/traps.= c linux-2.6.38.3/arch/parisc/ fault_address =3D regs->iaoq[0]; fault_space =3D regs->iasq[0]; =20 -diff -urNp linux-2.6.38.3/arch/parisc/mm/fault.c linux-2.6.38.3/arch/par= isc/mm/fault.c ---- linux-2.6.38.3/arch/parisc/mm/fault.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/parisc/mm/fault.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/parisc/mm/fault.c linux-2.6.38.4/arch/par= isc/mm/fault.c +--- linux-2.6.38.4/arch/parisc/mm/fault.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/parisc/mm/fault.c 2011-04-17 15:57:32.000000000 = -0400 @@ -15,6 +15,7 @@ #include #include @@ -1981,9 +1981,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/mm/fault.c li= nux-2.6.38.3/arch/parisc/mm/f =20 /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/device.h linux-2.6.38= .3/arch/powerpc/include/asm/device.h ---- linux-2.6.38.3/arch/powerpc/include/asm/device.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/device.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/device.h linux-2.6.38= .4/arch/powerpc/include/asm/device.h +--- linux-2.6.38.4/arch/powerpc/include/asm/device.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/device.h 2011-04-17 15:57:32= .000000000 -0400 @@ -17,7 +17,7 @@ struct device_node; */ struct dev_archdata { @@ -1993,9 +1993,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= device.h linux-2.6.38.3/arch/ =20 /* * When an iommu is in use, dma_data is used as a ptr to the base of t= he -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/dma-mapping.h linux-2= .6.38.3/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.38.3/arch/powerpc/include/asm/dma-mapping.h 2011-03-14 21:= 20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15:= 57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h linux-2= .6.38.4/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h 2011-03-14 21:= 20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15:= 57:32.000000000 -0400 @@ -66,12 +66,13 @@ static inline unsigned long device_to_ma /* * Available generic sets of operations @@ -2058,9 +2058,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= dma-mapping.h linux-2.6.38.3/ =20 if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/elf.h linux-2.6.38.3/= arch/powerpc/include/asm/elf.h ---- linux-2.6.38.3/arch/powerpc/include/asm/elf.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/elf.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/elf.h linux-2.6.38.4/= arch/powerpc/include/asm/elf.h +--- linux-2.6.38.4/arch/powerpc/include/asm/elf.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/elf.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -2093,9 +2093,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= elf.h linux-2.6.38.3/arch/pow #endif /* __KERNEL__ */ =20 /* -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/iommu.h linux-2.6.38.= 3/arch/powerpc/include/asm/iommu.h ---- linux-2.6.38.3/arch/powerpc/include/asm/iommu.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/iommu.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/iommu.h linux-2.6.38.= 4/arch/powerpc/include/asm/iommu.h +--- linux-2.6.38.4/arch/powerpc/include/asm/iommu.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/iommu.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi extern void iommu_init_early_dart(void); extern void iommu_init_early_pasemi(void); @@ -2106,9 +2106,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= iommu.h linux-2.6.38.3/arch/p #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/kmap_types.h linux-2.= 6.38.3/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.38.3/arch/powerpc/include/asm/kmap_types.h 2011-03-14 21:2= 0:32.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:5= 7:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h linux-2.= 6.38.4/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h 2011-03-14 21:2= 0:32.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:5= 7:32.000000000 -0400 @@ -27,6 +27,7 @@ enum km_type { KM_PPC_SYNC_PAGE, KM_PPC_SYNC_ICACHE, @@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= kmap_types.h linux-2.6.38.3/a KM_TYPE_NR }; =20 -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/page_64.h linux-2.6.3= 8.3/arch/powerpc/include/asm/page_64.h ---- linux-2.6.38.3/arch/powerpc/include/asm/page_64.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/page_64.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page_64.h linux-2.6.3= 8.4/arch/powerpc/include/asm/page_64.h +--- linux-2.6.38.4/arch/powerpc/include/asm/page_64.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/page_64.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -172,15 +172,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -2141,9 +2141,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= page_64.h linux-2.6.38.3/arch =20 #include =20 -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/page.h linux-2.6.38.3= /arch/powerpc/include/asm/page.h ---- linux-2.6.38.3/arch/powerpc/include/asm/page.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/page.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page.h linux-2.6.38.4= /arch/powerpc/include/asm/page.h +--- linux-2.6.38.4/arch/powerpc/include/asm/page.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/page.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -2166,9 +2166,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= page.h linux-2.6.38.3/arch/po #ifndef __ASSEMBLY__ =20 #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pci.h linux-2.6.38.3/= arch/powerpc/include/asm/pci.h ---- linux-2.6.38.3/arch/powerpc/include/asm/pci.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/pci.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pci.h linux-2.6.38.4/= arch/powerpc/include/asm/pci.h +--- linux-2.6.38.4/arch/powerpc/include/asm/pci.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/pci.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } =20 @@ -2180,9 +2180,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= pci.h linux-2.6.38.3/arch/pow #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pgtable.h linux-2.6.3= 8.3/arch/powerpc/include/asm/pgtable.h ---- linux-2.6.38.3/arch/powerpc/include/asm/pgtable.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h linux-2.6.3= 8.4/arch/powerpc/include/asm/pgtable.h +--- linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ @@ -2191,9 +2191,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= pgtable.h linux-2.6.38.3/arch #ifndef __ASSEMBLY__ #include /* For TASK_SIZE */ #include -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pte-hash32.h linux-2.= 6.38.3/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.38.3/arch/powerpc/include/asm/pte-hash32.h 2011-03-14 21:2= 0:32.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:5= 7:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h linux-2.= 6.38.4/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h 2011-03-14 21:2= 0:32.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:5= 7:32.000000000 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -2202,9 +2202,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= pte-hash32.h linux-2.6.38.3/a #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP system= s) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/reg.h linux-2.6.38.3/= arch/powerpc/include/asm/reg.h ---- linux-2.6.38.3/arch/powerpc/include/asm/reg.h 2011-04-18 17:27:13.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/reg.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/reg.h linux-2.6.38.4/= arch/powerpc/include/asm/reg.h +--- linux-2.6.38.4/arch/powerpc/include/asm/reg.h 2011-04-18 17:27:13.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/reg.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -2213,9 +2213,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= reg.h linux-2.6.38.3/arch/pow #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/swiotlb.h linux-2.6.3= 8.3/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.38.3/arch/powerpc/include/asm/swiotlb.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h linux-2.6.3= 8.4/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -13,7 +13,7 @@ =20 #include @@ -2225,9 +2225,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= swiotlb.h linux-2.6.38.3/arch =20 static inline void dma_mark_clean(void *addr, size_t size) {} =20 -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/system.h linux-2.6.38= .3/arch/powerpc/include/asm/system.h ---- linux-2.6.38.3/arch/powerpc/include/asm/system.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/system.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/system.h linux-2.6.38= .4/arch/powerpc/include/asm/system.h +--- linux-2.6.38.4/arch/powerpc/include/asm/system.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/system.h 2011-04-17 15:57:32= .000000000 -0400 @@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o)= , (n)) #endif @@ -2237,9 +2237,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= system.h linux-2.6.38.3/arch/ =20 /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); -diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/uaccess.h linux-2.6.3= 8.3/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.38.3/arch/powerpc/include/asm/uaccess.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h linux-2.6.3= 8.4/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -2417,9 +2417,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/= uaccess.h linux-2.6.38.3/arch extern unsigned long __clear_user(void __user *addr, unsigned long size= ); =20 static inline unsigned long clear_user(void __user *addr, unsigned long= size) -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma.c linux-2.6.38.3/arch/= powerpc/kernel/dma.c ---- linux-2.6.38.3/arch/powerpc/kernel/dma.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/dma.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma.c linux-2.6.38.4/arch/= powerpc/kernel/dma.c +--- linux-2.6.38.4/arch/powerpc/kernel/dma.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/dma.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2438,9 +2438,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma.c= linux-2.6.38.3/arch/powerpc/ =20 if (ppc_md.dma_set_mask) return ppc_md.dma_set_mask(dev, dma_mask); -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.3= /arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.38.3/arch/powerpc/kernel/dma-iommu.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.4= /arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } =20 @@ -2459,9 +2459,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma-i= ommu.c linux-2.6.38.3/arch/po .alloc_coherent =3D dma_iommu_alloc_coherent, .free_coherent =3D dma_iommu_free_coherent, .map_sg =3D dma_iommu_map_sg, -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38= .3/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.38.3/arch/powerpc/kernel/dma-swiotlb.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38= .4/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:57:32= .000000000 -0400 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -2471,9 +2471,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma-s= wiotlb.c linux-2.6.38.3/arch/ .alloc_coherent =3D dma_direct_alloc_coherent, .free_coherent =3D dma_direct_free_coherent, .map_sg =3D swiotlb_map_sg_attrs, -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/exceptions-64e.S linux-2.6= .38.3/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.38.3/arch/powerpc/kernel/exceptions-64e.S 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6= .38.4/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:57= :32.000000000 -0400 @@ -495,6 +495,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2492,9 +2492,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/excep= tions-64e.S linux-2.6.38.3/ar addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/exceptions-64s.S linux-2.6= .38.3/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.38.3/arch/powerpc/kernel/exceptions-64s.S 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6= .38.4/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:57= :32.000000000 -0400 @@ -848,10 +848,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2507,9 +2507,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/excep= tions-64s.S linux-2.6.38.3/ar mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/ibmebus.c linux-2.6.38.3/a= rch/powerpc/kernel/ibmebus.c ---- linux-2.6.38.3/arch/powerpc/kernel/ibmebus.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c linux-2.6.38.4/a= rch/powerpc/kernel/ibmebus.c +--- linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct=20 return 1; } @@ -2519,9 +2519,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/ibmeb= us.c linux-2.6.38.3/arch/powe .alloc_coherent =3D ibmebus_alloc_coherent, .free_coherent =3D ibmebus_free_coherent, .map_sg =3D ibmebus_map_sg, -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/kgdb.c linux-2.6.38.3/arch= /powerpc/kernel/kgdb.c ---- linux-2.6.38.3/arch/powerpc/kernel/kgdb.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/kgdb.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/kgdb.c linux-2.6.38.4/arch= /powerpc/kernel/kgdb.c +--- linux-2.6.38.4/arch/powerpc/kernel/kgdb.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/kgdb.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto /* * Global data @@ -2531,9 +2531,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/kgdb.= c linux-2.6.38.3/arch/powerpc .gdb_bpt_instr =3D {0x7d, 0x82, 0x10, 0x08}, }; =20 -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/module_32.c linux-2.6.38.3= /arch/powerpc/kernel/module_32.c ---- linux-2.6.38.3/arch/powerpc/kernel/module_32.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/module_32.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module_32.c linux-2.6.38.4= /arch/powerpc/kernel/module_32.c +--- linux-2.6.38.4/arch/powerpc/kernel/module_32.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/module_32.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section =3D i; } @@ -2563,9 +2563,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/modul= e_32.c linux-2.6.38.3/arch/po =20 /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/module.c linux-2.6.38.3/ar= ch/powerpc/kernel/module.c ---- linux-2.6.38.3/arch/powerpc/kernel/module.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/module.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module.c linux-2.6.38.4/ar= ch/powerpc/kernel/module.c +--- linux-2.6.38.4/arch/powerpc/kernel/module.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/module.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -31,11 +31,24 @@ =20 LIST_HEAD(module_bug_list); @@ -2605,9 +2605,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/modul= e.c linux-2.6.38.3/arch/power static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/pci-common.c linux-2.6.38.= 3/arch/powerpc/kernel/pci-common.c ---- linux-2.6.38.3/arch/powerpc/kernel/pci-common.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/pci-common.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/pci-common.c linux-2.6.38.= 4/arch/powerpc/kernel/pci-common.c +--- linux-2.6.38.4/arch/powerpc/kernel/pci-common.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/pci-common.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -52,14 +52,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags =3D 0; =20 @@ -2626,9 +2626,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/pci-c= ommon.c linux-2.6.38.3/arch/p { return pci_dma_ops; } -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/process.c linux-2.6.38.3/a= rch/powerpc/kernel/process.c ---- linux-2.6.38.3/arch/powerpc/kernel/process.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/process.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/process.c linux-2.6.38.4/a= rch/powerpc/kernel/process.c +--- linux-2.6.38.4/arch/powerpc/kernel/process.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/process.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -655,8 +655,8 @@ void show_regs(struct pt_regs * regs) * Lookup NIP late so we have the best change of getting the * above info out without failing @@ -2721,9 +2721,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/proce= ss.c linux-2.6.38.3/arch/powe - - return ret; -} -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/signal_32.c linux-2.6.38.3= /arch/powerpc/kernel/signal_32.c ---- linux-2.6.38.3/arch/powerpc/kernel/signal_32.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/signal_32.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_32.c linux-2.6.38.4= /arch/powerpc/kernel/signal_32.c +--- linux-2.6.38.4/arch/powerpc/kernel/signal_32.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/signal_32.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame =3D &rt_sf->uc.uc_mcontext; @@ -2733,9 +2733,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/signa= l_32.c linux-2.6.38.3/arch/po if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link =3D current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/signal_64.c linux-2.6.38.3= /arch/powerpc/kernel/signal_64.c ---- linux-2.6.38.3/arch/powerpc/kernel/signal_64.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/signal_64.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_64.c linux-2.6.38.4= /arch/powerpc/kernel/signal_64.c +--- linux-2.6.38.4/arch/powerpc/kernel/signal_64.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/signal_64.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val =3D 0; =20 @@ -2745,9 +2745,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/signa= l_64.c linux-2.6.38.3/arch/po regs->link =3D current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |=3D setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/vdso.c linux-2.6.38.3/arch= /powerpc/kernel/vdso.c ---- linux-2.6.38.3/arch/powerpc/kernel/vdso.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/vdso.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vdso.c linux-2.6.38.4/arch= /powerpc/kernel/vdso.c +--- linux-2.6.38.4/arch/powerpc/kernel/vdso.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/vdso.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -36,6 +36,7 @@ #include #include @@ -2774,9 +2774,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/vdso.= c linux-2.6.38.3/arch/powerpc if (IS_ERR_VALUE(vdso_base)) { rc =3D vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.38.3/arch/powerpc/kernel/vio.c linux-2.6.38.3/arch/= powerpc/kernel/vio.c ---- linux-2.6.38.3/arch/powerpc/kernel/vio.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/powerpc/kernel/vio.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vio.c linux-2.6.38.4/arch/= powerpc/kernel/vio.c +--- linux-2.6.38.4/arch/powerpc/kernel/vio.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/powerpc/kernel/vio.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s return dma_iommu_ops.dma_supported(dev, mask); } @@ -2791,9 +2791,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/vio.c= linux-2.6.38.3/arch/powerpc/ .map_page =3D vio_dma_iommu_map_page, .unmap_page =3D vio_dma_iommu_unmap_page, .dma_supported =3D vio_dma_iommu_dma_supported, -diff -urNp linux-2.6.38.3/arch/powerpc/lib/usercopy_64.c linux-2.6.38.3/= arch/powerpc/lib/usercopy_64.c ---- linux-2.6.38.3/arch/powerpc/lib/usercopy_64.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c linux-2.6.38.4/= arch/powerpc/lib/usercopy_64.c +--- linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -9,22 +9,6 @@ #include #include @@ -2825,9 +2825,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/lib/usercopy= _64.c linux-2.6.38.3/arch/pow -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); =20 -diff -urNp linux-2.6.38.3/arch/powerpc/mm/fault.c linux-2.6.38.3/arch/po= werpc/mm/fault.c ---- linux-2.6.38.3/arch/powerpc/mm/fault.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/powerpc/mm/fault.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/mm/fault.c linux-2.6.38.4/arch/po= werpc/mm/fault.c +--- linux-2.6.38.4/arch/powerpc/mm/fault.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/powerpc/mm/fault.c 2011-04-17 15:57:32.000000000= -0400 @@ -31,6 +31,10 @@ #include #include @@ -2932,9 +2932,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/mm/fault.c l= inux-2.6.38.3/arch/powerpc/mm _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.38.3/arch/powerpc/mm/mmap_64.c linux-2.6.38.3/arch/= powerpc/mm/mmap_64.c ---- linux-2.6.38.3/arch/powerpc/mm/mmap_64.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/powerpc/mm/mmap_64.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/mm/mmap_64.c linux-2.6.38.4/arch/= powerpc/mm/mmap_64.c +--- linux-2.6.38.4/arch/powerpc/mm/mmap_64.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/powerpc/mm/mmap_64.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2958,9 +2958,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/mm/mmap_64.c= linux-2.6.38.3/arch/powerpc/ mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.38.3/arch/powerpc/mm/slice.c linux-2.6.38.3/arch/po= werpc/mm/slice.c ---- linux-2.6.38.3/arch/powerpc/mm/slice.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/powerpc/mm/slice.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/mm/slice.c linux-2.6.38.4/arch/po= werpc/mm/slice.c +--- linux-2.6.38.4/arch/powerpc/mm/slice.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/powerpc/mm/slice.c 2011-04-17 15:57:32.000000000= -0400 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ if ((mm->task_size - len) < addr) return 0; @@ -3027,9 +3027,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/mm/slice.c l= inux-2.6.38.3/arch/powerpc/mm /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr =3D _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.38.3/arch/powerpc/platforms/cell/iommu.c linux-2.6.= 38.3/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.38.3/arch/powerpc/platforms/cell/iommu.c 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c linux-2.6.= 38.4/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:57:= 32.000000000 -0400 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc =20 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); @@ -3039,9 +3039,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/platforms/ce= ll/iommu.c linux-2.6.38.3/arc .alloc_coherent =3D dma_fixed_alloc_coherent, .free_coherent =3D dma_fixed_free_coherent, .map_sg =3D dma_fixed_map_sg, -diff -urNp linux-2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c linux-= 2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c 2011-03-14 21= :20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 15= :57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c linux-= 2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c 2011-03-14 21= :20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 15= :57:32.000000000 -0400 @@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi return mask >=3D DMA_BIT_MASK(32); } @@ -3060,9 +3060,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/platforms/ps= 3/system-bus.c linux-2.6.38.3 .alloc_coherent =3D ps3_alloc_coherent, .free_coherent =3D ps3_free_coherent, .map_sg =3D ps3_ioc0_map_sg, -diff -urNp linux-2.6.38.3/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.= 3/arch/powerpc/sysdev/ppc4xx_cpm.c ---- linux-2.6.38.3/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.= 4/arch/powerpc/sysdev/ppc4xx_cpm.c +--- linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -240,7 +240,7 @@ static int cpm_suspend_enter(suspend_sta return 0; } @@ -3072,9 +3072,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/sysdev/ppc4x= x_cpm.c linux-2.6.38.3/arch/p .valid =3D cpm_suspend_valid, .enter =3D cpm_suspend_enter, }; -diff -urNp linux-2.6.38.3/arch/s390/include/asm/elf.h linux-2.6.38.3/arc= h/s390/include/asm/elf.h ---- linux-2.6.38.3/arch/s390/include/asm/elf.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/s390/include/asm/elf.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/s390/include/asm/elf.h linux-2.6.38.4/arc= h/s390/include/asm/elf.h +--- linux-2.6.38.4/arch/s390/include/asm/elf.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/s390/include/asm/elf.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled; the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -3100,9 +3100,9 @@ diff -urNp linux-2.6.38.3/arch/s390/include/asm/elf= .h linux-2.6.38.3/arch/s390/i -#define arch_randomize_brk arch_randomize_brk - #endif -diff -urNp linux-2.6.38.3/arch/s390/include/asm/system.h linux-2.6.38.3/= arch/s390/include/asm/system.h ---- linux-2.6.38.3/arch/s390/include/asm/system.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/s390/include/asm/system.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/s390/include/asm/system.h linux-2.6.38.4/= arch/s390/include/asm/system.h +--- linux-2.6.38.4/arch/s390/include/asm/system.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/s390/include/asm/system.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *co extern void (*_machine_halt)(void); extern void (*_machine_power_off)(void); @@ -3112,9 +3112,9 @@ diff -urNp linux-2.6.38.3/arch/s390/include/asm/sys= tem.h linux-2.6.38.3/arch/s39 =20 static inline int tprot(unsigned long addr) { -diff -urNp linux-2.6.38.3/arch/s390/include/asm/uaccess.h linux-2.6.38.3= /arch/s390/include/asm/uaccess.h ---- linux-2.6.38.3/arch/s390/include/asm/uaccess.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/s390/include/asm/uaccess.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/s390/include/asm/uaccess.h linux-2.6.38.4= /arch/s390/include/asm/uaccess.h +--- linux-2.6.38.4/arch/s390/include/asm/uaccess.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/s390/include/asm/uaccess.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -234,6 +234,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -3147,9 +3147,9 @@ diff -urNp linux-2.6.38.3/arch/s390/include/asm/uac= cess.h linux-2.6.38.3/arch/s3 if (unlikely(sz !=3D -1 && sz < n)) { copy_from_user_overflow(); return n; -diff -urNp linux-2.6.38.3/arch/s390/Kconfig linux-2.6.38.3/arch/s390/Kco= nfig ---- linux-2.6.38.3/arch/s390/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/s390/Kconfig 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/s390/Kconfig linux-2.6.38.4/arch/s390/Kco= nfig +--- linux-2.6.38.4/arch/s390/Kconfig 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/s390/Kconfig 2011-04-17 15:57:32.000000000 -0400 @@ -233,11 +233,9 @@ config S390_EXEC_PROTECT prompt "Data execute protection" help @@ -3165,9 +3165,9 @@ diff -urNp linux-2.6.38.3/arch/s390/Kconfig linux-2= .6.38.3/arch/s390/Kconfig =20 comment "Code generation options" =20 -diff -urNp linux-2.6.38.3/arch/s390/kernel/module.c linux-2.6.38.3/arch/= s390/kernel/module.c ---- linux-2.6.38.3/arch/s390/kernel/module.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/s390/kernel/module.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/s390/kernel/module.c linux-2.6.38.4/arch/= s390/kernel/module.c +--- linux-2.6.38.4/arch/s390/kernel/module.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/s390/kernel/module.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, =20 /* Increase core size by size of got & plt and set start @@ -3239,9 +3239,9 @@ diff -urNp linux-2.6.38.3/arch/s390/kernel/module.c= linux-2.6.38.3/arch/s390/ker rela->r_addend - loc; if (r_type =3D=3D R_390_GOTPC) *(unsigned int *) loc =3D val; -diff -urNp linux-2.6.38.3/arch/s390/kernel/process.c linux-2.6.38.3/arch= /s390/kernel/process.c ---- linux-2.6.38.3/arch/s390/kernel/process.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/s390/kernel/process.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/s390/kernel/process.c linux-2.6.38.4/arch= /s390/kernel/process.c +--- linux-2.6.38.4/arch/s390/kernel/process.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/s390/kernel/process.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru } return 0; @@ -3282,9 +3282,9 @@ diff -urNp linux-2.6.38.3/arch/s390/kernel/process.= c linux-2.6.38.3/arch/s390/ke - return base; - return ret; -} -diff -urNp linux-2.6.38.3/arch/s390/kernel/setup.c linux-2.6.38.3/arch/s= 390/kernel/setup.c ---- linux-2.6.38.3/arch/s390/kernel/setup.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/s390/kernel/setup.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/s390/kernel/setup.c linux-2.6.38.4/arch/s= 390/kernel/setup.c +--- linux-2.6.38.4/arch/s390/kernel/setup.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/s390/kernel/setup.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -281,7 +281,7 @@ static int __init early_parse_mem(char * } early_param("mem", early_parse_mem); @@ -3333,9 +3333,9 @@ diff -urNp linux-2.6.38.3/arch/s390/kernel/setup.c = linux-2.6.38.3/arch/s390/kern static void setup_addressing_mode(void) { if (user_mode =3D=3D SECONDARY_SPACE_MODE) { -diff -urNp linux-2.6.38.3/arch/s390/mm/maccess.c linux-2.6.38.3/arch/s39= 0/mm/maccess.c ---- linux-2.6.38.3/arch/s390/mm/maccess.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/s390/mm/maccess.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/s390/mm/maccess.c linux-2.6.38.4/arch/s39= 0/mm/maccess.c +--- linux-2.6.38.4/arch/s390/mm/maccess.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/s390/mm/maccess.c 2011-04-17 15:57:32.000000000 = -0400 @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void=20 return rc ? rc : count; } @@ -3345,9 +3345,9 @@ diff -urNp linux-2.6.38.3/arch/s390/mm/maccess.c li= nux-2.6.38.3/arch/s390/mm/mac { long copied =3D 0; =20 -diff -urNp linux-2.6.38.3/arch/s390/mm/mmap.c linux-2.6.38.3/arch/s390/m= m/mmap.c ---- linux-2.6.38.3/arch/s390/mm/mmap.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/arch/s390/mm/mmap.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/arch/s390/mm/mmap.c linux-2.6.38.4/arch/s390/m= m/mmap.c +--- linux-2.6.38.4/arch/s390/mm/mmap.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/arch/s390/mm/mmap.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -3394,9 +3394,9 @@ diff -urNp linux-2.6.38.3/arch/s390/mm/mmap.c linux= -2.6.38.3/arch/s390/mm/mmap.c mm->get_unmapped_area =3D s390_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.38.3/arch/score/include/asm/system.h linux-2.6.38.3= /arch/score/include/asm/system.h ---- linux-2.6.38.3/arch/score/include/asm/system.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/score/include/asm/system.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/score/include/asm/system.h linux-2.6.38.4= /arch/score/include/asm/system.h +--- linux-2.6.38.4/arch/score/include/asm/system.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/score/include/asm/system.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -17,7 +17,7 @@ do { \ #define finish_arch_switch(prev) do {} while (0) =20 @@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.38.3/arch/score/include/asm/sy= stem.h linux-2.6.38.3/arch/sc =20 #define mb() barrier() #define rmb() barrier() -diff -urNp linux-2.6.38.3/arch/score/kernel/process.c linux-2.6.38.3/arc= h/score/kernel/process.c ---- linux-2.6.38.3/arch/score/kernel/process.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/score/kernel/process.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/score/kernel/process.c linux-2.6.38.4/arc= h/score/kernel/process.c +--- linux-2.6.38.4/arch/score/kernel/process.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/score/kernel/process.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru =20 return task_pt_regs(task)->cp0_epc; @@ -3418,9 +3418,9 @@ diff -urNp linux-2.6.38.3/arch/score/kernel/process= .c linux-2.6.38.3/arch/score/ -{ - return sp; -} -diff -urNp linux-2.6.38.3/arch/sh/include/asm/dma-mapping.h linux-2.6.38= .3/arch/sh/include/asm/dma-mapping.h ---- linux-2.6.38.3/arch/sh/include/asm/dma-mapping.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/sh/include/asm/dma-mapping.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h linux-2.6.38= .4/arch/sh/include/asm/dma-mapping.h +--- linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h 2011-04-17 15:57:32= .000000000 -0400 @@ -1,10 +1,10 @@ #ifndef __ASM_SH_DMA_MAPPING_H #define __ASM_SH_DMA_MAPPING_H @@ -3479,9 +3479,9 @@ diff -urNp linux-2.6.38.3/arch/sh/include/asm/dma-m= apping.h linux-2.6.38.3/arch/ =20 if (dma_release_from_coherent(dev, get_order(size), vaddr)) return; -diff -urNp linux-2.6.38.3/arch/sh/kernel/dma-nommu.c linux-2.6.38.3/arch= /sh/kernel/dma-nommu.c ---- linux-2.6.38.3/arch/sh/kernel/dma-nommu.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/sh/kernel/dma-nommu.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/sh/kernel/dma-nommu.c linux-2.6.38.4/arch= /sh/kernel/dma-nommu.c +--- linux-2.6.38.4/arch/sh/kernel/dma-nommu.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/sh/kernel/dma-nommu.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device=20 } #endif @@ -3491,9 +3491,9 @@ diff -urNp linux-2.6.38.3/arch/sh/kernel/dma-nommu.= c linux-2.6.38.3/arch/sh/kern .alloc_coherent =3D dma_generic_alloc_coherent, .free_coherent =3D dma_generic_free_coherent, .map_page =3D nommu_map_page, -diff -urNp linux-2.6.38.3/arch/sh/kernel/kgdb.c linux-2.6.38.3/arch/sh/k= ernel/kgdb.c ---- linux-2.6.38.3/arch/sh/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/sh/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/sh/kernel/kgdb.c linux-2.6.38.4/arch/sh/k= ernel/kgdb.c +--- linux-2.6.38.4/arch/sh/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/sh/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -319,7 +319,7 @@ void kgdb_arch_exit(void) unregister_die_notifier(&kgdb_notifier); } @@ -3503,9 +3503,9 @@ diff -urNp linux-2.6.38.3/arch/sh/kernel/kgdb.c lin= ux-2.6.38.3/arch/sh/kernel/kg /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr =3D { 0x3c, 0xc3 }, -diff -urNp linux-2.6.38.3/arch/sh/mm/consistent.c linux-2.6.38.3/arch/sh= /mm/consistent.c ---- linux-2.6.38.3/arch/sh/mm/consistent.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/sh/mm/consistent.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/sh/mm/consistent.c linux-2.6.38.4/arch/sh= /mm/consistent.c +--- linux-2.6.38.4/arch/sh/mm/consistent.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/sh/mm/consistent.c 2011-04-17 15:57:32.000000000= -0400 @@ -22,7 +22,7 @@ =20 #define PREALLOC_DMA_DEBUG_ENTRIES 4096 @@ -3515,9 +3515,9 @@ diff -urNp linux-2.6.38.3/arch/sh/mm/consistent.c l= inux-2.6.38.3/arch/sh/mm/cons EXPORT_SYMBOL(dma_ops); =20 static int __init dma_init(void) -diff -urNp linux-2.6.38.3/arch/sh/mm/mmap.c linux-2.6.38.3/arch/sh/mm/mm= ap.c ---- linux-2.6.38.3/arch/sh/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/sh/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sh/mm/mmap.c linux-2.6.38.4/arch/sh/mm/mm= ap.c +--- linux-2.6.38.4/arch/sh/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/sh/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str addr =3D PAGE_ALIGN(addr); =20 @@ -3592,9 +3592,9 @@ diff -urNp linux-2.6.38.3/arch/sh/mm/mmap.c linux-2= .6.38.3/arch/sh/mm/mmap.c =20 bottomup: /* -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/atomic_64.h linux-2.6.3= 8.3/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.38.3/arch/sparc/include/asm/atomic_64.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/atomic_64.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h linux-2.6.3= 8.4/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } =20 @@ -3754,9 +3754,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/at= omic_64.h linux-2.6.38.3/arch } =20 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/dma-mapping.h linux-2.6= .38.3/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.38.3/arch/sparc/include/asm/dma-mapping.h 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h linux-2.6= .38.4/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:57= :32.000000000 -0400 @@ -12,10 +12,10 @@ extern int dma_supported(struct device * #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f= ) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) @@ -3788,9 +3788,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/dm= a-mapping.h linux-2.6.38.3/ar =20 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/elf_32.h linux-2.6.38.3= /arch/sparc/include/asm/elf_32.h ---- linux-2.6.38.3/arch/sparc/include/asm/elf_32.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/elf_32.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_32.h linux-2.6.38.4= /arch/sparc/include/asm/elf_32.h +--- linux-2.6.38.4/arch/sparc/include/asm/elf_32.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/elf_32.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -114,6 +114,13 @@ typedef struct { =20 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3805,9 +3805,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/el= f_32.h linux-2.6.38.3/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspac= e on Sparc. */ -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/elf_64.h linux-2.6.38.3= /arch/sparc/include/asm/elf_64.h ---- linux-2.6.38.3/arch/sparc/include/asm/elf_64.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/elf_64.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_64.h linux-2.6.38.4= /arch/sparc/include/asm/elf_64.h +--- linux-2.6.38.4/arch/sparc/include/asm/elf_64.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/elf_64.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -162,6 +162,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3821,9 +3821,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/el= f_64.h linux-2.6.38.3/arch/sp =20 /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/pgtable_32.h linux-2.6.= 38.3/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.38.3/arch/sparc/include/asm/pgtable_32.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.= 38.4/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3855,9 +3855,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/pg= table_32.h linux-2.6.38.3/arc extern unsigned long page_kernel; =20 #ifdef MODULE -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38= .3/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.38.3/arch/sparc/include/asm/pgtsrmmu.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38= .4/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:57:32= .000000000 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3872,9 +3872,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/pg= tsrmmu.h linux-2.6.38.3/arch/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_P= RIV | \ SRMMU_DIRTY | SRMMU_REF) =20 -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/spinlock_64.h linux-2.6= .38.3/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.38.3/arch/sparc/include/asm/spinlock_64.h 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/spinlock_64.h 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h linux-2.6= .38.4/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h 2011-04-17 15:57= :32.000000000 -0400 @@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r __asm__ __volatile__ ( "1: ldsw [%2], %0\n" @@ -3926,9 +3926,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/sp= inlock_64.h linux-2.6.38.3/ar " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess_32.h linux-2.6.= 38.3/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.38.3/arch/sparc/include/asm/uaccess_32.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.= 38.4/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ =20 static inline unsigned long copy_to_user(void __user *to, const void *f= rom, unsigned long n) @@ -3980,9 +3980,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/ua= ccess_32.h linux-2.6.38.3/arc return __copy_user((__force void __user *) to, from, n); } =20 -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess_64.h linux-2.6.= 38.3/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.38.3/arch/sparc/include/asm/uaccess_64.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.= 38.4/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -10,6 +10,7 @@ #include #include @@ -4025,9 +4025,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/ua= ccess_64.h linux-2.6.38.3/arc if (unlikely(ret)) ret =3D copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess.h linux-2.6.38.= 3/arch/sparc/include/asm/uaccess.h ---- linux-2.6.38.3/arch/sparc/include/asm/uaccess.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/include/asm/uaccess.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess.h linux-2.6.38.= 4/arch/sparc/include/asm/uaccess.h +--- linux-2.6.38.4/arch/sparc/include/asm/uaccess.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/include/asm/uaccess.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -1,5 +1,13 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H @@ -4042,10 +4042,10 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/= uaccess.h linux-2.6.38.3/arch/s #if defined(__sparc__) && defined(__arch64__) #include #else -diff -urNp linux-2.6.38.3/arch/sparc/kernel/iommu.c linux-2.6.38.3/arch/= sparc/kernel/iommu.c ---- linux-2.6.38.3/arch/sparc/kernel/iommu.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/iommu.c 2011-04-17 15:57:32.0000000= 00 -0400 -@@ -827,7 +827,7 @@ static void dma_4u_sync_sg_for_cpu(struc +diff -urNp linux-2.6.38.4/arch/sparc/kernel/iommu.c linux-2.6.38.4/arch/= sparc/kernel/iommu.c +--- linux-2.6.38.4/arch/sparc/kernel/iommu.c 2011-04-22 19:20:59.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/iommu.c 2011-04-22 19:21:10.0000000= 00 -0400 +@@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } =20 @@ -4054,7 +4054,7 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/iommu.c= linux-2.6.38.3/arch/sparc/ke .alloc_coherent =3D dma_4u_alloc_coherent, .free_coherent =3D dma_4u_free_coherent, .map_page =3D dma_4u_map_page, -@@ -838,7 +838,7 @@ static struct dma_map_ops sun4u_dma_ops=20 +@@ -835,7 +835,7 @@ static struct dma_map_ops sun4u_dma_ops=20 .sync_sg_for_cpu =3D dma_4u_sync_sg_for_cpu, }; =20 @@ -4063,9 +4063,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/iommu.c= linux-2.6.38.3/arch/sparc/ke EXPORT_SYMBOL(dma_ops); =20 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.38.3/arch/sparc/kernel/ioport.c linux-2.6.38.3/arch= /sparc/kernel/ioport.c ---- linux-2.6.38.3/arch/sparc/kernel/ioport.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/ioport.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/ioport.c linux-2.6.38.4/arch= /sparc/kernel/ioport.c +--- linux-2.6.38.4/arch/sparc/kernel/ioport.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/ioport.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -4093,9 +4093,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/ioport.= c linux-2.6.38.3/arch/sparc/k .alloc_coherent =3D pci32_alloc_coherent, .free_coherent =3D pci32_free_coherent, .map_page =3D pci32_map_page, -diff -urNp linux-2.6.38.3/arch/sparc/kernel/kgdb_32.c linux-2.6.38.3/arc= h/sparc/kernel/kgdb_32.c ---- linux-2.6.38.3/arch/sparc/kernel/kgdb_32.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c linux-2.6.38.4/arc= h/sparc/kernel/kgdb_32.c +--- linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re regs->npc =3D regs->pc + 4; } @@ -4105,9 +4105,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/kgdb_32= .c linux-2.6.38.3/arch/sparc/ /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr =3D { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.38.3/arch/sparc/kernel/kgdb_64.c linux-2.6.38.3/arc= h/sparc/kernel/kgdb_64.c ---- linux-2.6.38.3/arch/sparc/kernel/kgdb_64.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c linux-2.6.38.4/arc= h/sparc/kernel/kgdb_64.c +--- linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re regs->tnpc =3D regs->tpc + 4; } @@ -4117,9 +4117,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/kgdb_64= .c linux-2.6.38.3/arch/sparc/ /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr =3D { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.38.3/arch/sparc/kernel/Makefile linux-2.6.38.3/arch= /sparc/kernel/Makefile ---- linux-2.6.38.3/arch/sparc/kernel/Makefile 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/Makefile 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/Makefile linux-2.6.38.4/arch= /sparc/kernel/Makefile +--- linux-2.6.38.4/arch/sparc/kernel/Makefile 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/Makefile 2011-04-17 15:57:32.000000= 000 -0400 @@ -3,7 +3,7 @@ # =20 @@ -4129,9 +4129,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/Makefil= e linux-2.6.38.3/arch/sparc/k =20 extra-y :=3D head_$(BITS).o extra-y +=3D init_task.o -diff -urNp linux-2.6.38.3/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.3/a= rch/sparc/kernel/pci_sun4v.c ---- linux-2.6.38.3/arch/sparc/kernel/pci_sun4v.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.4/a= rch/sparc/kernel/pci_sun4v.c +--- linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c 2011-04-22 19:20:59.000= 000000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c 2011-04-22 19:21:10.000= 000000 -0400 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -4141,9 +4141,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/pci_sun= 4v.c linux-2.6.38.3/arch/spar .alloc_coherent =3D dma_4v_alloc_coherent, .free_coherent =3D dma_4v_free_coherent, .map_page =3D dma_4v_map_page, -diff -urNp linux-2.6.38.3/arch/sparc/kernel/process_32.c linux-2.6.38.3/= arch/sparc/kernel/process_32.c ---- linux-2.6.38.3/arch/sparc/kernel/process_32.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/process_32.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_32.c linux-2.6.38.4/= arch/sparc/kernel/process_32.c +--- linux-2.6.38.4/arch/sparc/kernel/process_32.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/process_32.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) rw->ins[4], rw->ins[5], rw->ins[6], @@ -4179,9 +4179,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/process= _32.c linux-2.6.38.3/arch/spa fp =3D rw->ins[6]; } while (++count < 16); printk("\n"); -diff -urNp linux-2.6.38.3/arch/sparc/kernel/process_64.c linux-2.6.38.3/= arch/sparc/kernel/process_64.c ---- linux-2.6.38.3/arch/sparc/kernel/process_64.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/process_64.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_64.c linux-2.6.38.4/= arch/sparc/kernel/process_64.c +--- linux-2.6.38.4/arch/sparc/kernel/process_64.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/process_64.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); @@ -4217,9 +4217,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/process= _64.c linux-2.6.38.3/arch/spa (void *) gp->tpc, (void *) gp->o7, (void *) gp->i7, -diff -urNp linux-2.6.38.3/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.= 3/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.38.3/arch/sparc/kernel/sys_sparc_32.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.= 4/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -4238,9 +4238,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/sys_spa= rc_32.c linux-2.6.38.3/arch/s return addr; addr =3D vmm->vm_end; if (flags & MAP_SHARED) -diff -urNp linux-2.6.38.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.= 3/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.38.3/arch/sparc/kernel/sys_sparc_64.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.= 4/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -4388,9 +4388,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/sys_spa= rc_64.c linux-2.6.38.3/arch/s mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_32.c linux-2.6.38.3/ar= ch/sparc/kernel/traps_32.c ---- linux-2.6.38.3/arch/sparc/kernel/traps_32.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/traps_32.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_32.c linux-2.6.38.4/ar= ch/sparc/kernel/traps_32.c +--- linux-2.6.38.4/arch/sparc/kernel/traps_32.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/traps_32.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_ count++ < 30 && (((unsigned long) rw) >=3D PAGE_OFFSET) && @@ -4400,9 +4400,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_3= 2.c linux-2.6.38.3/arch/sparc (void *) rw->ins[7]); rw =3D (struct reg_window32 *)rw->ins[6]; } -diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_64.c linux-2.6.38.3/ar= ch/sparc/kernel/traps_64.c ---- linux-2.6.38.3/arch/sparc/kernel/traps_64.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/traps_64.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_64.c linux-2.6.38.4/ar= ch/sparc/kernel/traps_64.c +--- linux-2.6.38.4/arch/sparc/kernel/traps_64.c 2011-04-22 19:20:59.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/traps_64.c 2011-04-22 19:21:10.0000= 00000 -0400 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_ i + 1, p->trapstack[i].tstate, p->trapstack[i].tpc, @@ -4494,7 +4494,7 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_6= 4.c linux-2.6.38.3/arch/sparc (void *) regs->u_regs[UREG_I7]); printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] " "pte[%lx] error[%lx]\n", -@@ -2196,13 +2207,13 @@ void show_stack(struct task_struct *tsk, +@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, fp =3D (unsigned long)sf->fp + STACK_BIAS; } =20 @@ -4510,7 +4510,7 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_6= 4.c linux-2.6.38.3/arch/sparc graph++; } } -@@ -2255,7 +2266,7 @@ void die_if_kernel(char *str, struct pt_ +@@ -2254,7 +2265,7 @@ void die_if_kernel(char *str, struct pt_ while (rw && count++ < 30 && kstack_valid(tp, (unsigned long) rw)) { @@ -4519,9 +4519,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_6= 4.c linux-2.6.38.3/arch/sparc (void *) rw->ins[7]); =20 rw =3D kernel_stack_up(rw); -diff -urNp linux-2.6.38.3/arch/sparc/kernel/unaligned_64.c linux-2.6.38.= 3/arch/sparc/kernel/unaligned_64.c ---- linux-2.6.38.3/arch/sparc/kernel/unaligned_64.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c linux-2.6.38.= 4/arch/sparc/kernel/unaligned_64.c +--- linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); =20 @@ -4531,9 +4531,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/unalign= ed_64.c linux-2.6.38.3/arch/s regs->tpc, (void *) regs->tpc); } } -diff -urNp linux-2.6.38.3/arch/sparc/lib/atomic_64.S linux-2.6.38.3/arch= /sparc/lib/atomic_64.S ---- linux-2.6.38.3/arch/sparc/lib/atomic_64.S 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/sparc/lib/atomic_64.S 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/lib/atomic_64.S linux-2.6.38.4/arch= /sparc/lib/atomic_64.S +--- linux-2.6.38.4/arch/sparc/lib/atomic_64.S 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/sparc/lib/atomic_64.S 2011-04-17 15:57:32.000000= 000 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 =3D increment, %o1 =3D atomic_ptr */ BACKOFF_SETUP(%o2) @@ -4768,9 +4768,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/lib/atomic_64.= S linux-2.6.38.3/arch/sparc/l casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) -diff -urNp linux-2.6.38.3/arch/sparc/lib/ksyms.c linux-2.6.38.3/arch/spa= rc/lib/ksyms.c ---- linux-2.6.38.3/arch/sparc/lib/ksyms.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/sparc/lib/ksyms.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/sparc/lib/ksyms.c linux-2.6.38.4/arch/spa= rc/lib/ksyms.c +--- linux-2.6.38.4/arch/sparc/lib/ksyms.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/sparc/lib/ksyms.c 2011-04-17 15:57:32.000000000 = -0400 @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write); =20 /* Atomic counter implementation. */ @@ -4789,9 +4789,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/lib/ksyms.c li= nux-2.6.38.3/arch/sparc/lib/k EXPORT_SYMBOL(atomic64_sub_ret); =20 /* Atomic bit operations. */ -diff -urNp linux-2.6.38.3/arch/sparc/Makefile linux-2.6.38.3/arch/sparc/= Makefile ---- linux-2.6.38.3/arch/sparc/Makefile 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/arch/sparc/Makefile 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/arch/sparc/Makefile linux-2.6.38.4/arch/sparc/= Makefile +--- linux-2.6.38.4/arch/sparc/Makefile 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/arch/sparc/Makefile 2011-04-17 15:57:32.000000000 -04= 00 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) +=3D arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -4801,9 +4801,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/Makefile linux= -2.6.38.3/arch/sparc/Makefile VMLINUX_MAIN +=3D $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN +=3D $(drivers-y) $(net-y) =20 -diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_32.c linux-2.6.38.3/arch/s= parc/mm/fault_32.c ---- linux-2.6.38.3/arch/sparc/mm/fault_32.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/sparc/mm/fault_32.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_32.c linux-2.6.38.4/arch/s= parc/mm/fault_32.c +--- linux-2.6.38.4/arch/sparc/mm/fault_32.c 2011-04-22 19:20:59.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/sparc/mm/fault_32.c 2011-04-22 19:21:10.00000000= 0 -0400 @@ -22,6 +22,9 @@ #include #include @@ -5083,7 +5083,7 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_32.c = linux-2.6.38.3/arch/sparc/mm/ static noinline void do_fault_siginfo(int code, int sig, struct pt_regs= *regs, int text_fault) { -@@ -282,6 +547,24 @@ good_area: +@@ -281,6 +546,24 @@ good_area: if(!(vma->vm_flags & VM_WRITE)) goto bad_area; } else { @@ -5108,9 +5108,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_32.c = linux-2.6.38.3/arch/sparc/mm/ /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_64.c linux-2.6.38.3/arch/s= parc/mm/fault_64.c ---- linux-2.6.38.3/arch/sparc/mm/fault_64.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/sparc/mm/fault_64.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_64.c linux-2.6.38.4/arch/s= parc/mm/fault_64.c +--- linux-2.6.38.4/arch/sparc/mm/fault_64.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/sparc/mm/fault_64.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -21,6 +21,9 @@ #include #include @@ -5618,9 +5618,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_64.c = linux-2.6.38.3/arch/sparc/mm/ /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.38.3/arch/sparc/mm/hugetlbpage.c linux-2.6.38.3/arc= h/sparc/mm/hugetlbpage.c ---- linux-2.6.38.3/arch/sparc/mm/hugetlbpage.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c linux-2.6.38.4/arc= h/sparc/mm/hugetlbpage.c +--- linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -68,7 +68,7 @@ full_search: } return -ENOMEM; @@ -5680,9 +5680,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/hugetlbpage= .c linux-2.6.38.3/arch/sparc/ return addr; } if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area) -diff -urNp linux-2.6.38.3/arch/sparc/mm/init_32.c linux-2.6.38.3/arch/sp= arc/mm/init_32.c ---- linux-2.6.38.3/arch/sparc/mm/init_32.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/sparc/mm/init_32.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/sparc/mm/init_32.c linux-2.6.38.4/arch/sp= arc/mm/init_32.c +--- linux-2.6.38.4/arch/sparc/mm/init_32.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/sparc/mm/init_32.c 2011-04-17 15:57:32.000000000= -0400 @@ -318,6 +318,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -5717,9 +5717,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/init_32.c l= inux-2.6.38.3/arch/sparc/mm/i protection_map[12] =3D PAGE_READONLY; protection_map[13] =3D PAGE_READONLY; protection_map[14] =3D PAGE_SHARED; -diff -urNp linux-2.6.38.3/arch/sparc/mm/Makefile linux-2.6.38.3/arch/spa= rc/mm/Makefile ---- linux-2.6.38.3/arch/sparc/mm/Makefile 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/sparc/mm/Makefile 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/sparc/mm/Makefile linux-2.6.38.4/arch/spa= rc/mm/Makefile +--- linux-2.6.38.4/arch/sparc/mm/Makefile 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/sparc/mm/Makefile 2011-04-17 15:57:32.000000000 = -0400 @@ -2,7 +2,7 @@ # =20 @@ -5729,9 +5729,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/Makefile li= nux-2.6.38.3/arch/sparc/mm/Ma =20 obj-$(CONFIG_SPARC64) +=3D ultra.o tlb.o tsb.o obj-y +=3D fault_$(BITS).o -diff -urNp linux-2.6.38.3/arch/sparc/mm/srmmu.c linux-2.6.38.3/arch/spar= c/mm/srmmu.c ---- linux-2.6.38.3/arch/sparc/mm/srmmu.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/sparc/mm/srmmu.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/sparc/mm/srmmu.c linux-2.6.38.4/arch/spar= c/mm/srmmu.c +--- linux-2.6.38.4/arch/sparc/mm/srmmu.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/sparc/mm/srmmu.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED =3D pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -5746,9 +5746,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/srmmu.c lin= ux-2.6.38.3/arch/sparc/mm/srm BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel =3D pgprot_val(SRMMU_PAGE_KERNEL); =20 -diff -urNp linux-2.6.38.3/arch/um/include/asm/kmap_types.h linux-2.6.38.= 3/arch/um/include/asm/kmap_types.h ---- linux-2.6.38.3/arch/um/include/asm/kmap_types.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/um/include/asm/kmap_types.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/um/include/asm/kmap_types.h linux-2.6.38.= 4/arch/um/include/asm/kmap_types.h +--- linux-2.6.38.4/arch/um/include/asm/kmap_types.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/um/include/asm/kmap_types.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -5757,9 +5757,9 @@ diff -urNp linux-2.6.38.3/arch/um/include/asm/kmap_= types.h linux-2.6.38.3/arch/u KM_TYPE_NR }; =20 -diff -urNp linux-2.6.38.3/arch/um/include/asm/page.h linux-2.6.38.3/arch= /um/include/asm/page.h ---- linux-2.6.38.3/arch/um/include/asm/page.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/um/include/asm/page.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/um/include/asm/page.h linux-2.6.38.4/arch= /um/include/asm/page.h +--- linux-2.6.38.4/arch/um/include/asm/page.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/um/include/asm/page.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -5770,9 +5770,9 @@ diff -urNp linux-2.6.38.3/arch/um/include/asm/page.= h linux-2.6.38.3/arch/um/incl #ifndef __ASSEMBLY__ =20 struct page; -diff -urNp linux-2.6.38.3/arch/um/kernel/process.c linux-2.6.38.3/arch/u= m/kernel/process.c ---- linux-2.6.38.3/arch/um/kernel/process.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/um/kernel/process.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/um/kernel/process.c linux-2.6.38.4/arch/u= m/kernel/process.c +--- linux-2.6.38.4/arch/um/kernel/process.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/um/kernel/process.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -404,22 +404,6 @@ int singlestepping(void * t) return 2; } @@ -5796,9 +5796,9 @@ diff -urNp linux-2.6.38.3/arch/um/kernel/process.c = linux-2.6.38.3/arch/um/kernel unsigned long get_wchan(struct task_struct *p) { unsigned long stack_page, sp, ip; -diff -urNp linux-2.6.38.3/arch/um/sys-i386/syscalls.c linux-2.6.38.3/arc= h/um/sys-i386/syscalls.c ---- linux-2.6.38.3/arch/um/sys-i386/syscalls.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/um/sys-i386/syscalls.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/um/sys-i386/syscalls.c linux-2.6.38.4/arc= h/um/sys-i386/syscalls.c +--- linux-2.6.38.4/arch/um/sys-i386/syscalls.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/um/sys-i386/syscalls.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -5821,9 +5821,9 @@ diff -urNp linux-2.6.38.3/arch/um/sys-i386/syscalls= .c linux-2.6.38.3/arch/um/sys /* * The prototype on i386 is: * -diff -urNp linux-2.6.38.3/arch/x86/boot/bitops.h linux-2.6.38.3/arch/x86= /boot/bitops.h ---- linux-2.6.38.3/arch/x86/boot/bitops.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/boot/bitops.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/bitops.h linux-2.6.38.4/arch/x86= /boot/bitops.h +--- linux-2.6.38.4/arch/x86/boot/bitops.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/boot/bitops.h 2011-04-17 15:57:32.000000000 = -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int=20 u8 v; const u32 *p =3D (const u32 *)addr; @@ -5842,9 +5842,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/bitops.h li= nux-2.6.38.3/arch/x86/boot/bi } =20 #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.38.3/arch/x86/boot/boot.h linux-2.6.38.3/arch/x86/b= oot/boot.h ---- linux-2.6.38.3/arch/x86/boot/boot.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/arch/x86/boot/boot.h 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/arch/x86/boot/boot.h linux-2.6.38.4/arch/x86/b= oot/boot.h +--- linux-2.6.38.4/arch/x86/boot/boot.h 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/arch/x86/boot/boot.h 2011-04-17 15:57:32.000000000 -0= 400 @@ -85,7 +85,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -5863,9 +5863,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/boot.h linu= x-2.6.38.3/arch/x86/boot/boot : "=3Dqm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/head_32.S linux-2.6.3= 8.3/arch/x86/boot/compressed/head_32.S ---- linux-2.6.38.3/arch/x86/boot/compressed/head_32.S 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/boot/compressed/head_32.S 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_32.S linux-2.6.3= 8.4/arch/x86/boot/compressed/head_32.S +--- linux-2.6.38.4/arch/x86/boot/compressed/head_32.S 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/boot/compressed/head_32.S 2011-04-17 15:57:3= 2.000000000 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5894,9 +5894,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/= head_32.S linux-2.6.38.3/arch addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/head_64.S linux-2.6.3= 8.3/arch/x86/boot/compressed/head_64.S ---- linux-2.6.38.3/arch/x86/boot/compressed/head_64.S 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/boot/compressed/head_64.S 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_64.S linux-2.6.3= 8.4/arch/x86/boot/compressed/head_64.S +--- linux-2.6.38.4/arch/x86/boot/compressed/head_64.S 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/boot/compressed/head_64.S 2011-04-17 15:57:3= 2.000000000 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5915,9 +5915,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/= head_64.S linux-2.6.38.3/arch #endif =20 /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/misc.c linux-2.6.38.3= /arch/x86/boot/compressed/misc.c ---- linux-2.6.38.3/arch/x86/boot/compressed/misc.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/boot/compressed/misc.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/misc.c linux-2.6.38.4= /arch/x86/boot/compressed/misc.c +--- linux-2.6.38.4/arch/x86/boot/compressed/misc.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/boot/compressed/misc.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -310,7 +310,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -5936,9 +5936,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/= misc.c linux-2.6.38.3/arch/x8 error("Wrong destination address"); #endif =20 -diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/relocs.c linux-2.6.38= .3/arch/x86/boot/compressed/relocs.c ---- linux-2.6.38.3/arch/x86/boot/compressed/relocs.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/boot/compressed/relocs.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/relocs.c linux-2.6.38= .4/arch/x86/boot/compressed/relocs.c +--- linux-2.6.38.4/arch/x86/boot/compressed/relocs.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/boot/compressed/relocs.c 2011-04-17 15:57:32= .000000000 -0400 @@ -13,8 +13,11 @@ =20 static void die(char *fmt, ...); @@ -6131,9 +6131,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/= relocs.c linux-2.6.38.3/arch/ read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.38.3/arch/x86/boot/cpucheck.c linux-2.6.38.3/arch/x= 86/boot/cpucheck.c ---- linux-2.6.38.3/arch/x86/boot/cpucheck.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/boot/cpucheck.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/cpucheck.c linux-2.6.38.4/arch/x= 86/boot/cpucheck.c +--- linux-2.6.38.4/arch/x86/boot/cpucheck.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/boot/cpucheck.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw =3D -1, fsw =3D -1; u32 cr0; @@ -6229,9 +6229,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/cpucheck.c = linux-2.6.38.3/arch/x86/boot/ =20 err =3D check_flags(); } -diff -urNp linux-2.6.38.3/arch/x86/boot/header.S linux-2.6.38.3/arch/x86= /boot/header.S ---- linux-2.6.38.3/arch/x86/boot/header.S 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/boot/header.S 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/header.S linux-2.6.38.4/arch/x86= /boot/header.S +--- linux-2.6.38.4/arch/x86/boot/header.S 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/boot/header.S 2011-04-17 15:57:32.000000000 = -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -6241,9 +6241,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/header.S li= nux-2.6.38.3/arch/x86/boot/he =20 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.38.3/arch/x86/boot/memory.c linux-2.6.38.3/arch/x86= /boot/memory.c ---- linux-2.6.38.3/arch/x86/boot/memory.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/boot/memory.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/memory.c linux-2.6.38.4/arch/x86= /boot/memory.c +--- linux-2.6.38.4/arch/x86/boot/memory.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/boot/memory.c 2011-04-17 15:57:32.000000000 = -0400 @@ -19,7 +19,7 @@ =20 static int detect_memory_e820(void) @@ -6253,9 +6253,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/memory.c li= nux-2.6.38.3/arch/x86/boot/me struct biosregs ireg, oreg; struct e820entry *desc =3D boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-2.6.38.3/arch/x86/boot/video.c linux-2.6.38.3/arch/x86/= boot/video.c ---- linux-2.6.38.3/arch/x86/boot/video.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/boot/video.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/video.c linux-2.6.38.4/arch/x86/= boot/video.c +--- linux-2.6.38.4/arch/x86/boot/video.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/boot/video.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -96,7 +96,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -6265,9 +6265,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/video.c lin= ux-2.6.38.3/arch/x86/boot/vid int key; unsigned int v; =20 -diff -urNp linux-2.6.38.3/arch/x86/boot/video-vesa.c linux-2.6.38.3/arch= /x86/boot/video-vesa.c ---- linux-2.6.38.3/arch/x86/boot/video-vesa.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/boot/video-vesa.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/boot/video-vesa.c linux-2.6.38.4/arch= /x86/boot/video-vesa.c +--- linux-2.6.38.4/arch/x86/boot/video-vesa.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/boot/video-vesa.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) =20 boot_params.screen_info.vesapm_seg =3D oreg.es; @@ -6276,9 +6276,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/video-vesa.= c linux-2.6.38.3/arch/x86/boo } =20 /* -diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32_aout.c linux-2.6.38.3/arch/= x86/ia32/ia32_aout.c ---- linux-2.6.38.3/arch/x86/ia32/ia32_aout.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/ia32/ia32_aout.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_aout.c linux-2.6.38.4/arch/= x86/ia32/ia32_aout.c +--- linux-2.6.38.4/arch/x86/ia32/ia32_aout.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/ia32/ia32_aout.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st unsigned long dump_start, dump_size; struct user32 dump; @@ -6288,9 +6288,9 @@ diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32_aout.c= linux-2.6.38.3/arch/x86/ia32 fs =3D get_fs(); set_fs(KERNEL_DS); has_dumped =3D 1; -diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32entry.S linux-2.6.38.3/arch/= x86/ia32/ia32entry.S ---- linux-2.6.38.3/arch/x86/ia32/ia32entry.S 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/ia32/ia32entry.S 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32entry.S linux-2.6.38.4/arch/= x86/ia32/ia32entry.S +--- linux-2.6.38.4/arch/x86/ia32/ia32entry.S 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/ia32/ia32entry.S 2011-04-17 15:57:32.0000000= 00 -0400 @@ -13,6 +13,7 @@ #include =09 #include @@ -6428,9 +6428,9 @@ diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32entry.S= linux-2.6.38.3/arch/x86/ia32 /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: -diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32_signal.c linux-2.6.38.3/arc= h/x86/ia32/ia32_signal.c ---- linux-2.6.38.3/arch/x86/ia32/ia32_signal.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/ia32/ia32_signal.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_signal.c linux-2.6.38.4/arc= h/x86/ia32/ia32_signal.c +--- linux-2.6.38.4/arch/x86/ia32/ia32_signal.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/ia32/ia32_signal.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct=20 sp -=3D frame_size; /* Align the stack pointer according to the i386 ABI, @@ -6480,9 +6480,9 @@ diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32_signal= .c linux-2.6.38.3/arch/x86/ia } put_user_catch(err); =20 if (err) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/alternative.h linux-2.6.3= 8.3/arch/x86/include/asm/alternative.h ---- linux-2.6.38.3/arch/x86/include/asm/alternative.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/alternative.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/alternative.h linux-2.6.3= 8.4/arch/x86/include/asm/alternative.h +--- linux-2.6.38.4/arch/x86/include/asm/alternative.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/alternative.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -94,7 +94,7 @@ static inline int alternatives_text_rese ".section .discard,\"aw\",@progbits\n" \ " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <=3D slen */= \ @@ -6492,9 +6492,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/alte= rnative.h linux-2.6.38.3/arch "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" =20 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/apm.h linux-2.6.38.3/arch= /x86/include/asm/apm.h ---- linux-2.6.38.3/arch/x86/include/asm/apm.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/apm.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/apm.h linux-2.6.38.4/arch= /x86/include/asm/apm.h +--- linux-2.6.38.4/arch/x86/include/asm/apm.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/apm.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -6513,9 +6513,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/apm.= h linux-2.6.38.3/arch/x86/inc "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic64_32.h linux-2.6.3= 8.3/arch/x86/include/asm/atomic64_32.h ---- linux-2.6.38.3/arch/x86/include/asm/atomic64_32.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/atomic64_32.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.3= 8.4/arch/x86/include/asm/atomic64_32.h +--- linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -12,6 +12,14 @@ typedef struct { u64 __aligned(8) counter; } atomic64_t; @@ -6531,9 +6531,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/atom= ic64_32.h linux-2.6.38.3/arch #define ATOMIC64_INIT(val) { (val) } =20 #ifdef CONFIG_X86_CMPXCHG64 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic64_64.h linux-2.6.3= 8.3/arch/x86/include/asm/atomic64_64.h ---- linux-2.6.38.3/arch/x86/include/asm/atomic64_64.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/atomic64_64.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h linux-2.6.3= 8.4/arch/x86/include/asm/atomic64_64.h +--- linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -18,7 +18,19 @@ */ static inline long atomic64_read(const atomic64_t *v) @@ -6843,9 +6843,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/atom= ic64_64.h linux-2.6.38.3/arch } =20 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic.h linux-2.6.38.3/a= rch/x86/include/asm/atomic.h ---- linux-2.6.38.3/arch/x86/include/asm/atomic.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/atomic.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic.h linux-2.6.38.4/a= rch/x86/include/asm/atomic.h +--- linux-2.6.38.4/arch/x86/include/asm/atomic.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/atomic.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -22,7 +22,18 @@ */ static inline int atomic_read(const atomic_t *v) @@ -7217,9 +7217,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/atom= ic.h linux-2.6.38.3/arch/x86/ /* * atomic_dec_if_positive - decrement by 1 if old value positive * @v: pointer of type atomic_t -diff -urNp linux-2.6.38.3/arch/x86/include/asm/bitops.h linux-2.6.38.3/a= rch/x86/include/asm/bitops.h ---- linux-2.6.38.3/arch/x86/include/asm/bitops.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/bitops.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/bitops.h linux-2.6.38.4/a= rch/x86/include/asm/bitops.h +--- linux-2.6.38.4/arch/x86/include/asm/bitops.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/bitops.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -38,7 +38,7 @@ * a mask operation on a byte. */ @@ -7229,9 +7229,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/bito= ps.h linux-2.6.38.3/arch/x86/ #define CONST_MASK(nr) (1 << ((nr) & 7)) =20 /** -diff -urNp linux-2.6.38.3/arch/x86/include/asm/boot.h linux-2.6.38.3/arc= h/x86/include/asm/boot.h ---- linux-2.6.38.3/arch/x86/include/asm/boot.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/boot.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/boot.h linux-2.6.38.4/arc= h/x86/include/asm/boot.h +--- linux-2.6.38.4/arch/x86/include/asm/boot.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/boot.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -11,10 +11,15 @@ #include =20 @@ -7249,9 +7249,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/boot= .h linux-2.6.38.3/arch/x86/in /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.38.3/arch/x86/include/asm/cacheflush.h linux-2.6.38= .3/arch/x86/include/asm/cacheflush.h ---- linux-2.6.38.3/arch/x86/include/asm/cacheflush.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/cacheflush.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/cacheflush.h linux-2.6.38= .4/arch/x86/include/asm/cacheflush.h +--- linux-2.6.38.4/arch/x86/include/asm/cacheflush.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/cacheflush.h 2011-04-17 15:57:32= .000000000 -0400 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem unsigned long pg_flags =3D pg->flags & _PGMT_MASK; =20 @@ -7261,9 +7261,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/cach= eflush.h linux-2.6.38.3/arch/ else if (pg_flags =3D=3D _PGMT_WC) return _PAGE_CACHE_WC; else if (pg_flags =3D=3D _PGMT_UC_MINUS) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/cache.h linux-2.6.38.3/ar= ch/x86/include/asm/cache.h ---- linux-2.6.38.3/arch/x86/include/asm/cache.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/cache.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/cache.h linux-2.6.38.4/ar= ch/x86/include/asm/cache.h +--- linux-2.6.38.4/arch/x86/include/asm/cache.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/cache.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) =20 @@ -7272,9 +7272,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/cach= e.h linux-2.6.38.3/arch/x86/i =20 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/checksum_32.h linux-2.6.3= 8.3/arch/x86/include/asm/checksum_32.h ---- linux-2.6.38.3/arch/x86/include/asm/checksum_32.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/checksum_32.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/checksum_32.h linux-2.6.3= 8.4/arch/x86/include/asm/checksum_32.h +--- linux-2.6.38.4/arch/x86/include/asm/checksum_32.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/checksum_32.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -7308,9 +7308,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/chec= ksum_32.h linux-2.6.38.3/arch len, sum, NULL, err_ptr); =20 if (len) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/cpufeature.h linux-2.6.38= .3/arch/x86/include/asm/cpufeature.h ---- linux-2.6.38.3/arch/x86/include/asm/cpufeature.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/cpufeature.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/cpufeature.h linux-2.6.38= .4/arch/x86/include/asm/cpufeature.h +--- linux-2.6.38.4/arch/x86/include/asm/cpufeature.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/cpufeature.h 2011-04-17 15:57:32= .000000000 -0400 @@ -349,7 +349,7 @@ static __always_inline __pure bool __sta ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ @@ -7320,9 +7320,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/cpuf= eature.h linux-2.6.38.3/arch/ "3: movb $1,%0\n" "4:\n" ".previous\n" -diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc_defs.h linux-2.6.38.= 3/arch/x86/include/asm/desc_defs.h ---- linux-2.6.38.3/arch/x86/include/asm/desc_defs.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/desc_defs.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc_defs.h linux-2.6.38.= 4/arch/x86/include/asm/desc_defs.h +--- linux-2.6.38.4/arch/x86/include/asm/desc_defs.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/desc_defs.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -31,6 +31,12 @@ struct desc_struct { unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; @@ -7336,9 +7336,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= _defs.h linux-2.6.38.3/arch/x }; } __attribute__((packed)); =20 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arc= h/x86/include/asm/desc.h ---- linux-2.6.38.3/arch/x86/include/asm/desc.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/desc.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc.h linux-2.6.38.4/arc= h/x86/include/asm/desc.h +--- linux-2.6.38.4/arch/x86/include/asm/desc.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/desc.h 2011-04-23 12:47:27.00000= 0000 -0400 @@ -4,6 +4,7 @@ #include #include @@ -7393,7 +7393,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= .h linux-2.6.38.3/arch/x86/in } =20 #endif -@@ -115,19 +118,24 @@ static inline void paravirt_free_ldt(str +@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(str static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate) { @@ -7411,14 +7411,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/des= c.h linux-2.6.38.3/arch/x86/in } =20 static inline void native_write_gdt_entry(struct desc_struct *gdt, int = entry, - const void *desc, int type) - { - unsigned int size; -+ - switch (type) { - case DESC_TSS: - size =3D sizeof(tss_desc); -@@ -139,7 +147,10 @@ static inline void native_write_gdt_entr +@@ -139,7 +146,10 @@ static inline void native_write_gdt_entr size =3D sizeof(struct desc_struct); break; } @@ -7429,7 +7422,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= .h linux-2.6.38.3/arch/x86/in } =20 static inline void pack_descriptor(struct desc_struct *desc, unsigned l= ong base, -@@ -211,7 +222,9 @@ static inline void native_set_ldt(const=20 +@@ -211,7 +221,9 @@ static inline void native_set_ldt(const=20 =20 static inline void native_load_tr_desc(void) { @@ -7439,7 +7432,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= .h linux-2.6.38.3/arch/x86/in } =20 static inline void native_load_gdt(const struct desc_ptr *dtr) -@@ -246,8 +259,10 @@ static inline void native_load_tls(struc +@@ -246,8 +258,10 @@ static inline void native_load_tls(struc unsigned int i; struct desc_struct *gdt =3D get_cpu_gdt_table(cpu); =20 @@ -7450,7 +7443,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= .h linux-2.6.38.3/arch/x86/in } =20 #define _LDT_empty(info) \ -@@ -309,7 +324,7 @@ static inline void set_desc_limit(struct +@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct desc->limit =3D (limit >> 16) & 0xf; } =20 @@ -7459,7 +7452,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= .h linux-2.6.38.3/arch/x86/in unsigned dpl, unsigned ist, unsigned seg) { gate_desc s; -@@ -327,7 +342,7 @@ static inline void _set_gate(int gate, u +@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, u * Pentium F0 0F bugfix can have resulted in the mapped * IDT being write-protected. */ @@ -7468,7 +7461,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= .h linux-2.6.38.3/arch/x86/in { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); -@@ -356,19 +371,19 @@ static inline void alloc_intr_gate(unsig +@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsig /* * This routine sets up an interrupt gate at directory privilege level = 3. */ @@ -7491,7 +7484,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= .h linux-2.6.38.3/arch/x86/in { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); -@@ -377,19 +392,31 @@ static inline void set_trap_gate(unsigne +@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigne static inline void set_task_gate(unsigned int n, unsigned int gdt_entry= ) { BUG_ON((unsigned)n > 0xFF); @@ -7526,9 +7519,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc= .h linux-2.6.38.3/arch/x86/in +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/device.h linux-2.6.38.3/a= rch/x86/include/asm/device.h ---- linux-2.6.38.3/arch/x86/include/asm/device.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/device.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/device.h linux-2.6.38.4/a= rch/x86/include/asm/device.h +--- linux-2.6.38.4/arch/x86/include/asm/device.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/device.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -7538,9 +7531,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/devi= ce.h linux-2.6.38.3/arch/x86/ #endif #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU) void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/dma-mapping.h linux-2.6.3= 8.3/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.38.3/arch/x86/include/asm/dma-mapping.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h linux-2.6.3= 8.4/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -26,9 +26,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -7580,9 +7573,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/dma-= mapping.h linux-2.6.38.3/arch =20 WARN_ON(irqs_disabled()); /* for portability */ =20 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/e820.h linux-2.6.38.3/arc= h/x86/include/asm/e820.h ---- linux-2.6.38.3/arch/x86/include/asm/e820.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/e820.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/e820.h linux-2.6.38.4/arc= h/x86/include/asm/e820.h +--- linux-2.6.38.4/arch/x86/include/asm/e820.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/e820.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -69,7 +69,7 @@ struct e820map { #define ISA_START_ADDRESS 0xa0000 #define ISA_END_ADDRESS 0x100000 @@ -7592,9 +7585,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/e820= .h linux-2.6.38.3/arch/x86/in #define BIOS_END 0x00100000 =20 #define BIOS_ROM_BASE 0xffe00000 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/elf.h linux-2.6.38.3/arch= /x86/include/asm/elf.h ---- linux-2.6.38.3/arch/x86/include/asm/elf.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/elf.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/elf.h linux-2.6.38.4/arch= /x86/include/asm/elf.h +--- linux-2.6.38.4/arch/x86/include/asm/elf.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/elf.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -237,7 +237,25 @@ extern int force_personality32; the loader. We need to make sure that it is out of the way of the p= rogram that it will "exec", and that there is sufficient room for the brk. = */ @@ -7648,9 +7641,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/elf.= h linux-2.6.38.3/arch/x86/inc -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/futex.h linux-2.6.38.3/ar= ch/x86/include/asm/futex.h ---- linux-2.6.38.3/arch/x86/include/asm/futex.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/futex.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/futex.h linux-2.6.38.4/ar= ch/x86/include/asm/futex.h +--- linux-2.6.38.4/arch/x86/include/asm/futex.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/futex.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -12,16 +12,18 @@ #include =20 @@ -7726,9 +7719,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/fute= x.h linux-2.6.38.3/arch/x86/i : "i" (-EFAULT), "r" (newval), "0" (oldval) : "memory" ); -diff -urNp linux-2.6.38.3/arch/x86/include/asm/i387.h linux-2.6.38.3/arc= h/x86/include/asm/i387.h ---- linux-2.6.38.3/arch/x86/include/asm/i387.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/i387.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/i387.h linux-2.6.38.4/arc= h/x86/include/asm/i387.h +--- linux-2.6.38.4/arch/x86/include/asm/i387.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/i387.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc { int err; @@ -7787,9 +7780,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/i387= .h linux-2.6.38.3/arch/x86/in else clts(); } -diff -urNp linux-2.6.38.3/arch/x86/include/asm/io.h linux-2.6.38.3/arch/= x86/include/asm/io.h ---- linux-2.6.38.3/arch/x86/include/asm/io.h 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/io.h 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/io.h linux-2.6.38.4/arch/= x86/include/asm/io.h +--- linux-2.6.38.4/arch/x86/include/asm/io.h 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/io.h 2011-04-17 15:57:32.0000000= 00 -0400 @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void); =20 #include @@ -7808,9 +7801,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/io.h= linux-2.6.38.3/arch/x86/incl /* * Convert a virtual cached pointer to an uncached pointer */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/iommu.h linux-2.6.38.3/ar= ch/x86/include/asm/iommu.h ---- linux-2.6.38.3/arch/x86/include/asm/iommu.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/iommu.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/iommu.h linux-2.6.38.4/ar= ch/x86/include/asm/iommu.h +--- linux-2.6.38.4/arch/x86/include/asm/iommu.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/iommu.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -1,7 +1,7 @@ #ifndef _ASM_X86_IOMMU_H #define _ASM_X86_IOMMU_H @@ -7820,9 +7813,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/iomm= u.h linux-2.6.38.3/arch/x86/i extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.38.3/arch/x86/include/asm/irqflags.h linux-2.6.38.3= /arch/x86/include/asm/irqflags.h ---- linux-2.6.38.3/arch/x86/include/asm/irqflags.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/irqflags.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/irqflags.h linux-2.6.38.4= /arch/x86/include/asm/irqflags.h +--- linux-2.6.38.4/arch/x86/include/asm/irqflags.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/irqflags.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i sti; \ sysexit @@ -7835,9 +7828,28 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/irq= flags.h linux-2.6.38.3/arch/x8 #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-2.6.38.3/arch/x86/include/asm/kvm_host.h linux-2.6.38.3= /arch/x86/include/asm/kvm_host.h ---- linux-2.6.38.3/arch/x86/include/asm/kvm_host.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/kvm_host.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/kprobes.h linux-2.6.38.4/= arch/x86/include/asm/kprobes.h +--- linux-2.6.38.4/arch/x86/include/asm/kprobes.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/kprobes.h 2011-04-23 12:47:28.00= 0000000 -0400 +@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t; + #define RELATIVEJUMP_SIZE 5 + #define RELATIVECALL_OPCODE 0xe8 + #define RELATIVE_ADDR_SIZE 4 +-#define MAX_STACK_SIZE 64 +-#define MIN_STACK_SIZE(ADDR) \ +- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \ +- THREAD_SIZE - (unsigned long)(ADDR))) \ +- ? (MAX_STACK_SIZE) \ +- : (((unsigned long)current_thread_info()) + \ +- THREAD_SIZE - (unsigned long)(ADDR))) ++#define MAX_STACK_SIZE 64UL ++#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - = (unsigned long)(ADDR)) +=20 + #define flush_insn_slot(p) do { } while (0) +=20 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/kvm_host.h linux-2.6.38.4= /arch/x86/include/asm/kvm_host.h +--- linux-2.6.38.4/arch/x86/include/asm/kvm_host.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/kvm_host.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -603,7 +603,7 @@ struct kvm_arch_async_pf { bool direct_map; }; @@ -7847,9 +7859,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/kvm_= host.h linux-2.6.38.3/arch/x8 =20 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.38.3/arch/x86/include/asm/local.h linux-2.6.38.3/ar= ch/x86/include/asm/local.h ---- linux-2.6.38.3/arch/x86/include/asm/local.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/local.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/local.h linux-2.6.38.4/ar= ch/x86/include/asm/local.h +--- linux-2.6.38.4/arch/x86/include/asm/local.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/local.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -18,26 +18,58 @@ typedef struct { =20 static inline void local_inc(local_t *l) @@ -8002,23 +8014,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/loc= al.h linux-2.6.38.3/arch/x86/i : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.38.3/arch/x86/include/asm/mc146818rtc.h linux-2.6.3= 8.3/arch/x86/include/asm/mc146818rtc.h ---- linux-2.6.38.3/arch/x86/include/asm/mc146818rtc.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/mc146818rtc.h 2011-04-17 15:57:3= 2.000000000 -0400 -@@ -81,8 +81,8 @@ static inline unsigned char current_lock - #else - #define lock_cmos_prefix(reg) do {} while (0) - #define lock_cmos_suffix(reg) do {} while (0) --#define lock_cmos(reg) --#define unlock_cmos() -+#define lock_cmos(reg) do {} while (0) -+#define unlock_cmos() do {} while (0) - #define do_i_have_lock_cmos() 0 - #define current_lock_cmos_reg() 0 - #endif -diff -urNp linux-2.6.38.3/arch/x86/include/asm/mce.h linux-2.6.38.3/arch= /x86/include/asm/mce.h ---- linux-2.6.38.3/arch/x86/include/asm/mce.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/mce.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/mce.h linux-2.6.38.4/arch= /x86/include/asm/mce.h +--- linux-2.6.38.4/arch/x86/include/asm/mce.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/mce.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -198,7 +198,7 @@ int mce_notify_irq(void); void mce_notify_process(void); =20 @@ -8028,9 +8026,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/mce.= h linux-2.6.38.3/arch/x86/inc =20 /* * Exception handler -diff -urNp linux-2.6.38.3/arch/x86/include/asm/microcode.h linux-2.6.38.= 3/arch/x86/include/asm/microcode.h ---- linux-2.6.38.3/arch/x86/include/asm/microcode.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/microcode.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/microcode.h linux-2.6.38.= 4/arch/x86/include/asm/microcode.h +--- linux-2.6.38.4/arch/x86/include/asm/microcode.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/microcode.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; =20 @@ -8077,9 +8075,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/micr= ocode.h linux-2.6.38.3/arch/x { return NULL; } -diff -urNp linux-2.6.38.3/arch/x86/include/asm/mman.h linux-2.6.38.3/arc= h/x86/include/asm/mman.h ---- linux-2.6.38.3/arch/x86/include/asm/mman.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/mman.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/mman.h linux-2.6.38.4/arc= h/x86/include/asm/mman.h +--- linux-2.6.38.4/arch/x86/include/asm/mman.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/mman.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -5,4 +5,14 @@ =20 #include @@ -8095,9 +8093,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/mman= .h linux-2.6.38.3/arch/x86/in +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/mmu_context.h linux-2.6.3= 8.3/arch/x86/include/asm/mmu_context.h ---- linux-2.6.38.3/arch/x86/include/asm/mmu_context.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/mmu_context.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu_context.h linux-2.6.3= 8.4/arch/x86/include/asm/mmu_context.h +--- linux-2.6.38.4/arch/x86/include/asm/mmu_context.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/mmu_context.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m =20 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_str= uct *tsk) @@ -8221,9 +8219,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/mmu_= context.h linux-2.6.38.3/arch } =20 #define activate_mm(prev, next) \ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/mmu.h linux-2.6.38.3/arch= /x86/include/asm/mmu.h ---- linux-2.6.38.3/arch/x86/include/asm/mmu.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/mmu.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu.h linux-2.6.38.4/arch= /x86/include/asm/mmu.h +--- linux-2.6.38.4/arch/x86/include/asm/mmu.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/mmu.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -8250,40 +8248,53 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/mm= u.h linux-2.6.38.3/arch/x86/inc } mm_context_t; =20 #ifdef CONFIG_SMP -diff -urNp linux-2.6.38.3/arch/x86/include/asm/module.h linux-2.6.38.3/a= rch/x86/include/asm/module.h ---- linux-2.6.38.3/arch/x86/include/asm/module.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/module.h 2011-04-17 15:57:32.000= 000000 -0400 -@@ -59,8 +59,26 @@ +diff -urNp linux-2.6.38.4/arch/x86/include/asm/module.h linux-2.6.38.4/a= rch/x86/include/asm/module.h +--- linux-2.6.38.4/arch/x86/include/asm/module.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/module.h 2011-04-23 12:51:37.000= 000000 -0400 +@@ -5,6 +5,7 @@ +=20 + #ifdef CONFIG_X86_64 + /* X86_64 does not define MODULE_PROC_FAMILY */ ++#define MODULE_PROC_FAMILY "" + #elif defined CONFIG_M386 + #define MODULE_PROC_FAMILY "386 " + #elif defined CONFIG_M486 +@@ -59,8 +60,30 @@ #error unknown processor family #endif =20 +-#ifdef CONFIG_X86_32 +-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY +#ifdef CONFIG_PAX_MEMORY_UDEREF +#define MODULE_PAX_UDEREF "UDEREF " +#else +#define MODULE_PAX_UDEREF "" +#endif + - #ifdef CONFIG_X86_32 --# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY -+# ifdef CONFIG_PAX_KERNEXEC -+# define MODULE_PAX_KERNEXEC "KERNEXEC " -+# else -+# define MODULE_PAX_KERNEXEC "" -+# endif -+# ifdef CONFIG_GRKERNSEC -+# define MODULE_GRSEC "GRSECURITY " -+# else -+# define MODULE_GRSEC "" -+# endif -+# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PA= X_KERNEXEC MODULE_PAX_UDEREF ++#ifdef CONFIG_PAX_KERNEXEC ++#define MODULE_PAX_KERNEXEC "KERNEXEC " +#else -+# define MODULE_ARCH_VERMAGIC MODULE_PAX_UDEREF ++#define MODULE_PAX_KERNEXEC "" #endif =20 ++#ifdef CONFIG_PAX_REFCOUNT ++#define MODULE_PAX_REFCOUNT "REFCOUNT " ++#else ++#define MODULE_PAX_REFCOUNT "" ++#endif ++ ++#ifdef CONFIG_GRKERNSEC ++#define MODULE_GRSEC "GRSECURITY " ++#else ++#define MODULE_GRSEC "" ++#endif ++ ++#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX= _KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT ++ #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/page_64_types.h linux-2.6= .38.3/arch/x86/include/asm/page_64_types.h ---- linux-2.6.38.3/arch/x86/include/asm/page_64_types.h 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/page_64_types.h 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/page_64_types.h linux-2.6= .38.4/arch/x86/include/asm/page_64_types.h +--- linux-2.6.38.4/arch/x86/include/asm/page_64_types.h 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/page_64_types.h 2011-04-17 15:57= :32.000000000 -0400 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from); =20 /* duplicated to the one in bootmem.h */ @@ -8293,9 +8304,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/page= _64_types.h linux-2.6.38.3/ar =20 extern unsigned long __phys_addr(unsigned long); #define __phys_reloc_hide(x) (x) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/paravirt.h linux-2.6.38.3= /arch/x86/include/asm/paravirt.h ---- linux-2.6.38.3/arch/x86/include/asm/paravirt.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/paravirt.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt.h linux-2.6.38.4= /arch/x86/include/asm/paravirt.h +--- linux-2.6.38.4/arch/x86/include/asm/paravirt.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/paravirt.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -8349,9 +8360,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/para= virt.h linux-2.6.38.3/arch/x8 #endif /* CONFIG_X86_32 */ =20 #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/paravirt_types.h linux-2.= 6.38.3/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.38.3/arch/x86/include/asm/paravirt_types.h 2011-03-14 21:2= 0:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/paravirt_types.h 2011-04-17 15:5= 7:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h linux-2.= 6.38.4/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h 2011-03-14 21:2= 0:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h 2011-04-17 15:5= 7:32.000000000 -0400 @@ -317,6 +317,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -8365,9 +8376,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/para= virt_types.h linux-2.6.38.3/a }; =20 struct arch_spinlock; -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pci_x86.h linux-2.6.38.3/= arch/x86/include/asm/pci_x86.h ---- linux-2.6.38.3/arch/x86/include/asm/pci_x86.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pci_x86.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pci_x86.h linux-2.6.38.4/= arch/x86/include/asm/pci_x86.h +--- linux-2.6.38.4/arch/x86/include/asm/pci_x86.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pci_x86.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct=20 extern void (*pcibios_disable_irq)(struct pci_dev *dev); =20 @@ -8390,9 +8401,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pci_= x86.h linux-2.6.38.3/arch/x86 extern bool port_cf9_safe; =20 /* arch_initcall level */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgalloc.h linux-2.6.38.3/= arch/x86/include/asm/pgalloc.h ---- linux-2.6.38.3/arch/x86/include/asm/pgalloc.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgalloc.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgalloc.h linux-2.6.38.4/= arch/x86/include/asm/pgalloc.h +--- linux-2.6.38.4/arch/x86/include/asm/pgalloc.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgalloc.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -8407,9 +8418,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgal= loc.h linux-2.6.38.3/arch/x86 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } =20 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable-2level.h linux-2.= 6.38.3/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.38.3/arch/x86/include/asm/pgtable-2level.h 2011-03-14 21:2= 0:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:5= 7:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h linux-2.= 6.38.4/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h 2011-03-14 21:2= 0:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:5= 7:32.000000000 -0400 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t=20 =20 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -8420,9 +8431,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgta= ble-2level.h linux-2.6.38.3/a } =20 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_32.h linux-2.6.38= .3/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.38.3/arch/x86/include/asm/pgtable_32.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h linux-2.6.38= .4/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:57:32= .000000000 -0400 @@ -25,9 +25,6 @@ struct mm_struct; struct vm_area_struct; @@ -8466,9 +8477,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgta= ble_32.h linux-2.6.38.3/arch/ /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_32_types.h linux-= 2.6.38.3/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.38.3/arch/x86/include/asm/pgtable_32_types.h 2011-03-14 21= :20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 15= :57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h linux-= 2.6.38.4/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h 2011-03-14 21= :20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 15= :57:32.000000000 -0400 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -8498,9 +8509,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgta= ble_32_types.h linux-2.6.38.3 #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable-3level.h linux-2.= 6.38.3/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.38.3/arch/x86/include/asm/pgtable-3level.h 2011-04-18 17:2= 7:13.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:5= 7:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h linux-2.= 6.38.4/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h 2011-04-18 17:2= 7:13.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:5= 7:32.000000000 -0400 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic =20 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -8518,9 +8529,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgta= ble-3level.h linux-2.6.38.3/a } =20 /* -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_64.h linux-2.6.38= .3/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.38.3/arch/x86/include/asm/pgtable_64.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_64.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h linux-2.6.38= .4/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h 2011-04-17 15:57:32= .000000000 -0400 @@ -16,10 +16,13 @@ =20 extern pud_t level3_kernel_pgt[512]; @@ -8557,9 +8568,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgta= ble_64.h linux-2.6.38.3/arch/ } =20 static inline void native_pgd_clear(pgd_t *pgd) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_64_types.h linux-= 2.6.38.3/arch/x86/include/asm/pgtable_64_types.h ---- linux-2.6.38.3/arch/x86/include/asm/pgtable_64_types.h 2011-03-14 21= :20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 15= :57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h linux-= 2.6.38.4/arch/x86/include/asm/pgtable_64_types.h +--- linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h 2011-03-14 21= :20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 15= :57:32.000000000 -0400 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) @@ -8571,9 +8582,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgta= ble_64_types.h linux-2.6.38.3 +#define ktva_ktla(addr) (addr) =20 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable.h linux-2.6.38.3/= arch/x86/include/asm/pgtable.h ---- linux-2.6.38.3/arch/x86/include/asm/pgtable.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgtable.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable.h linux-2.6.38.4/= arch/x86/include/asm/pgtable.h +--- linux-2.6.38.4/arch/x86/include/asm/pgtable.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgtable.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm =20 #define arch_end_context_switch(prev) do {} while(0) @@ -8743,9 +8754,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgta= ble.h linux-2.6.38.3/arch/x86 =20 #include #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_types.h linux-2.6= .38.3/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.38.3/arch/x86/include/asm/pgtable_types.h 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h linux-2.6= .38.4/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:57= :32.000000000 -0400 @@ -16,13 +16,12 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -8859,9 +8870,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgta= ble_types.h linux-2.6.38.3/ar =20 #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.38.3/arch/x86/include/asm/processor.h linux-2.6.38.= 3/arch/x86/include/asm/processor.h ---- linux-2.6.38.3/arch/x86/include/asm/processor.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/processor.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.= 4/arch/x86/include/asm/processor.h +--- linux-2.6.38.4/arch/x86/include/asm/processor.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/processor.h 2011-04-23 12:47:27.= 000000000 -0400 @@ -270,7 +270,7 @@ struct tss_struct { =20 } ____cacheline_aligned; @@ -8906,7 +8917,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/proc= essor.h linux-2.6.38.3/arch/x - unsigned long *__ptr =3D (unsigned long *)(info); = \ - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); = \ -}) -+#define KSTK_TOP(info) ((info)->task.thread.sp0) ++#define KSTK_TOP(info) ((container_of(info, struct task_struct,= tinfo))->thread.sp0) =20 /* * The below -8 is to reserve 8 bytes on top of the ring0 stack. @@ -8946,9 +8957,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/proc= essor.h linux-2.6.38.3/arch/x #define KSTK_EIP(task) (task_pt_regs(task)->ip) =20 /* Get/set a process' ability to use the timestamp counter instruction = */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/ptrace.h linux-2.6.38.3/a= rch/x86/include/asm/ptrace.h ---- linux-2.6.38.3/arch/x86/include/asm/ptrace.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/ptrace.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/ptrace.h linux-2.6.38.4/a= rch/x86/include/asm/ptrace.h +--- linux-2.6.38.4/arch/x86/include/asm/ptrace.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/ptrace.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_ } =20 @@ -8985,9 +8996,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/ptra= ce.h linux-2.6.38.3/arch/x86/ #endif } =20 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/reboot.h linux-2.6.38.3/a= rch/x86/include/asm/reboot.h ---- linux-2.6.38.3/arch/x86/include/asm/reboot.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/reboot.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/reboot.h linux-2.6.38.4/a= rch/x86/include/asm/reboot.h +--- linux-2.6.38.4/arch/x86/include/asm/reboot.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/reboot.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; =20 void native_machine_crash_shutdown(struct pt_regs *regs); @@ -8997,9 +9008,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/rebo= ot.h linux-2.6.38.3/arch/x86/ =20 typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.38.3/arch/x86/include/asm/rwsem.h linux-2.6.38.3/ar= ch/x86/include/asm/rwsem.h ---- linux-2.6.38.3/arch/x86/include/asm/rwsem.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/rwsem.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/rwsem.h linux-2.6.38.4/ar= ch/x86/include/asm/rwsem.h +--- linux-2.6.38.4/arch/x86/include/asm/rwsem.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/rwsem.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -9124,9 +9135,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/rwse= m.h linux-2.6.38.3/arch/x86/i : "+r" (tmp), "+m" (sem->count) : : "memory"); =20 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/segment.h linux-2.6.38.3/= arch/x86/include/asm/segment.h ---- linux-2.6.38.3/arch/x86/include/asm/segment.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/segment.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/segment.h linux-2.6.38.4/= arch/x86/include/asm/segment.h +--- linux-2.6.38.4/arch/x86/include/asm/segment.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/segment.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -9186,9 +9197,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/segm= ent.h linux-2.6.38.3/arch/x86 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3) -diff -urNp linux-2.6.38.3/arch/x86/include/asm/smp.h linux-2.6.38.3/arch= /x86/include/asm/smp.h ---- linux-2.6.38.3/arch/x86/include/asm/smp.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/smp.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/smp.h linux-2.6.38.4/arch= /x86/include/asm/smp.h +--- linux-2.6.38.4/arch/x86/include/asm/smp.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/smp.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -24,7 +24,7 @@ extern unsigned int num_processors; DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map); DECLARE_PER_CPU(cpumask_var_t, cpu_core_map); @@ -9215,9 +9226,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/smp.= h linux-2.6.38.3/arch/x86/inc #define safe_smp_processor_id() smp_processor_id() =20 #endif -diff -urNp linux-2.6.38.3/arch/x86/include/asm/spinlock.h linux-2.6.38.3= /arch/x86/include/asm/spinlock.h ---- linux-2.6.38.3/arch/x86/include/asm/spinlock.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/spinlock.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/spinlock.h linux-2.6.38.4= /arch/x86/include/asm/spinlock.h +--- linux-2.6.38.4/arch/x86/include/asm/spinlock.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/spinlock.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar static inline void arch_read_lock(arch_rwlock_t *rw) { @@ -9280,9 +9291,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/spin= lock.h linux-2.6.38.3/arch/x8 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } =20 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/stackprotector.h linux-2.= 6.38.3/arch/x86/include/asm/stackprotector.h ---- linux-2.6.38.3/arch/x86/include/asm/stackprotector.h 2011-03-14 21:2= 0:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/stackprotector.h 2011-04-17 15:5= 7:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/stackprotector.h linux-2.= 6.38.4/arch/x86/include/asm/stackprotector.h +--- linux-2.6.38.4/arch/x86/include/asm/stackprotector.h 2011-03-14 21:2= 0:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/stackprotector.h 2011-04-17 15:5= 7:32.000000000 -0400 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se =20 static inline void load_stack_canary_segment(void) @@ -9292,9 +9303,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/stac= kprotector.h linux-2.6.38.3/a asm volatile ("mov %0, %%gs" : : "r" (0)); #endif } -diff -urNp linux-2.6.38.3/arch/x86/include/asm/stacktrace.h linux-2.6.38= .3/arch/x86/include/asm/stacktrace.h ---- linux-2.6.38.3/arch/x86/include/asm/stacktrace.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/stacktrace.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/stacktrace.h linux-2.6.38= .4/arch/x86/include/asm/stacktrace.h +--- linux-2.6.38.4/arch/x86/include/asm/stacktrace.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/stacktrace.h 2011-04-17 15:57:32= .000000000 -0400 @@ -11,28 +11,20 @@ =20 extern int kstack_depth_to_print; @@ -9345,9 +9356,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/stac= ktrace.h linux-2.6.38.3/arch/ }; =20 void dump_trace(struct task_struct *tsk, struct pt_regs *regs, -diff -urNp linux-2.6.38.3/arch/x86/include/asm/system.h linux-2.6.38.3/a= rch/x86/include/asm/system.h ---- linux-2.6.38.3/arch/x86/include/asm/system.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/system.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/system.h linux-2.6.38.4/a= rch/x86/include/asm/system.h +--- linux-2.6.38.4/arch/x86/include/asm/system.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/system.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -131,7 +131,7 @@ do { \ "call __switch_to\n\t" \ "movq "__percpu_arg([current_task])",%%rsi\n\t" \ @@ -9384,9 +9395,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/syst= em.h linux-2.6.38.3/arch/x86/ extern void free_init_pages(char *what, unsigned long begin, unsigned l= ong end); =20 void default_idle(void); -diff -urNp linux-2.6.38.3/arch/x86/include/asm/thread_info.h linux-2.6.3= 8.3/arch/x86/include/asm/thread_info.h ---- linux-2.6.38.3/arch/x86/include/asm/thread_info.h 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/thread_info.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/thread_info.h linux-2.6.3= 8.4/arch/x86/include/asm/thread_info.h +--- linux-2.6.38.4/arch/x86/include/asm/thread_info.h 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/thread_info.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -10,6 +10,7 @@ #include #include @@ -9531,9 +9542,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/thre= ad_info.h linux-2.6.38.3/arch + #endif #endif /* _ASM_X86_THREAD_INFO_H */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess_32.h linux-2.6.38= .3/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.38.3/arch/x86/include/asm/uaccess_32.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/uaccess_32.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h linux-2.6.38= .4/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h 2011-04-17 15:57:32= .000000000 -0400 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned lon= g n) @@ -9690,9 +9701,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/uacc= ess_32.h linux-2.6.38.3/arch/ return n; } =20 -diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess_64.h linux-2.6.38= .3/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.38.3/arch/x86/include/asm/uaccess_64.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/uaccess_64.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h linux-2.6.38= .4/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h 2011-04-17 15:57:32= .000000000 -0400 @@ -11,6 +11,9 @@ #include #include @@ -10065,9 +10076,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/ua= ccess_64.h linux-2.6.38.3/arch/ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zero= rest); =20 #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess.h linux-2.6.38.3/= arch/x86/include/asm/uaccess.h ---- linux-2.6.38.3/arch/x86/include/asm/uaccess.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/uaccess.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess.h linux-2.6.38.4/= arch/x86/include/asm/uaccess.h +--- linux-2.6.38.4/arch/x86/include/asm/uaccess.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/uaccess.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -8,12 +8,15 @@ #include #include @@ -10286,9 +10297,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/ua= ccess.h linux-2.6.38.3/arch/x86 #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.38.3/arch/x86/include/asm/vgtod.h linux-2.6.38.3/ar= ch/x86/include/asm/vgtod.h ---- linux-2.6.38.3/arch/x86/include/asm/vgtod.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/vgtod.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/vgtod.h linux-2.6.38.4/ar= ch/x86/include/asm/vgtod.h +--- linux-2.6.38.4/arch/x86/include/asm/vgtod.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/vgtod.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -10297,9 +10308,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/vg= tod.h linux-2.6.38.3/arch/x86/i cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.38.3/arch/x86/include/asm/vsyscall.h linux-2.6.38.3= /arch/x86/include/asm/vsyscall.h ---- linux-2.6.38.3/arch/x86/include/asm/vsyscall.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/vsyscall.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/vsyscall.h linux-2.6.38.4= /arch/x86/include/asm/vsyscall.h +--- linux-2.6.38.4/arch/x86/include/asm/vsyscall.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/vsyscall.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { =20 #ifdef __KERNEL__ @@ -10330,9 +10341,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/vs= yscall.h linux-2.6.38.3/arch/x8 #endif /* __KERNEL__ */ =20 #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.38.3/arch/x86/include/asm/xsave.h linux-2.6.38.3/ar= ch/x86/include/asm/xsave.h ---- linux-2.6.38.3/arch/x86/include/asm/xsave.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/include/asm/xsave.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/include/asm/xsave.h linux-2.6.38.4/ar= ch/x86/include/asm/xsave.h +--- linux-2.6.38.4/arch/x86/include/asm/xsave.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/include/asm/xsave.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav { int err; @@ -10357,9 +10368,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/xs= ave.h linux-2.6.38.3/arch/x86/i __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.38.3/arch/x86/Kconfig linux-2.6.38.3/arch/x86/Kconf= ig ---- linux-2.6.38.3/arch/x86/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/Kconfig 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/Kconfig linux-2.6.38.4/arch/x86/Kconf= ig +--- linux-2.6.38.4/arch/x86/Kconfig 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/Kconfig 2011-04-17 15:57:32.000000000 -0400 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE =20 config X86_32_LAZY_GS @@ -10441,9 +10452,9 @@ diff -urNp linux-2.6.38.3/arch/x86/Kconfig linux-= 2.6.38.3/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. =20 -diff -urNp linux-2.6.38.3/arch/x86/Kconfig.cpu linux-2.6.38.3/arch/x86/K= config.cpu ---- linux-2.6.38.3/arch/x86/Kconfig.cpu 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/arch/x86/Kconfig.cpu 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/arch/x86/Kconfig.cpu linux-2.6.38.4/arch/x86/K= config.cpu +--- linux-2.6.38.4/arch/x86/Kconfig.cpu 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/arch/x86/Kconfig.cpu 2011-04-17 15:57:32.000000000 -0= 400 @@ -339,7 +339,7 @@ config X86_PPRO_FENCE =20 config X86_F00F_BUG @@ -10471,9 +10482,9 @@ diff -urNp linux-2.6.38.3/arch/x86/Kconfig.cpu li= nux-2.6.38.3/arch/x86/Kconfig.c =20 config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.38.3/arch/x86/Kconfig.debug linux-2.6.38.3/arch/x86= /Kconfig.debug ---- linux-2.6.38.3/arch/x86/Kconfig.debug 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/Kconfig.debug 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/Kconfig.debug linux-2.6.38.4/arch/x86= /Kconfig.debug +--- linux-2.6.38.4/arch/x86/Kconfig.debug 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/Kconfig.debug 2011-04-17 15:57:32.000000000 = -0400 @@ -101,7 +101,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -10492,21 +10503,9 @@ diff -urNp linux-2.6.38.3/arch/x86/Kconfig.debug= linux-2.6.38.3/arch/x86/Kconfig ---help--- This option helps catch unintended modifications to loadable kernel module's text and read-only data. It also prevents execution -diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/boot.c linux-2.6.38.3/arc= h/x86/kernel/acpi/boot.c ---- linux-2.6.38.3/arch/x86/kernel/acpi/boot.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/acpi/boot.c 2011-04-17 15:57:32.00000= 0000 -0400 -@@ -1472,7 +1472,7 @@ static struct dmi_system_id __initdata a - DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), - }, - }, -- {} -+ { NULL, NULL, {{0, {0}}}, NULL} - }; -=20 - /* -diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/sleep.c linux-2.6.38.3/ar= ch/x86/kernel/acpi/sleep.c ---- linux-2.6.38.3/arch/x86/kernel/acpi/sleep.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/acpi/sleep.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c linux-2.6.38.4/ar= ch/x86/kernel/acpi/sleep.c +--- linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -18,7 +18,7 @@ #include "realmode/wakeup.h" #include "sleep.h" @@ -10529,9 +10528,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/sl= eep.c linux-2.6.38.3/arch/x86/k initial_gs =3D per_cpu_offset(smp_processor_id()); #endif initial_code =3D (unsigned long)wakeup_long64; -diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.= 3/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.38.3/arch/x86/kernel/acpi/wakeup_32.S 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.= 4/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:57:32.= 000000000 -0400 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -10548,9 +10547,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/wa= keup_32.S linux-2.6.38.3/arch/x =20 bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.38.3/arch/x86/kernel/alternative.c linux-2.6.38.3/a= rch/x86/kernel/alternative.c ---- linux-2.6.38.3/arch/x86/kernel/alternative.c 2011-04-18 17:27:13.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/alternative.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/alternative.c linux-2.6.38.4/a= rch/x86/kernel/alternative.c +--- linux-2.6.38.4/arch/x86/kernel/alternative.c 2011-04-18 17:27:13.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/alternative.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -248,7 +248,7 @@ static void alternatives_smp_lock(const=20 if (!*poff || ptr < text || ptr >=3D text_end) continue; @@ -10664,9 +10663,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/alterna= tive.c linux-2.6.38.3/arch/x86/ #endif =20 void __init arch_init_ideal_nop5(void) -diff -urNp linux-2.6.38.3/arch/x86/kernel/amd_iommu.c linux-2.6.38.3/arc= h/x86/kernel/amd_iommu.c ---- linux-2.6.38.3/arch/x86/kernel/amd_iommu.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/amd_iommu.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/amd_iommu.c linux-2.6.38.4/arc= h/x86/kernel/amd_iommu.c +--- linux-2.6.38.4/arch/x86/kernel/amd_iommu.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/amd_iommu.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -2286,7 +2286,7 @@ static void prealloc_protection_domains( } } @@ -10676,9 +10675,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/amd_iom= mu.c linux-2.6.38.3/arch/x86/ke .alloc_coherent =3D alloc_coherent, .free_coherent =3D free_coherent, .map_page =3D map_page, -diff -urNp linux-2.6.38.3/arch/x86/kernel/apic/io_apic.c linux-2.6.38.3/= arch/x86/kernel/apic/io_apic.c ---- linux-2.6.38.3/arch/x86/kernel/apic/io_apic.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/apic/io_apic.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c linux-2.6.38.4/= arch/x86/kernel/apic/io_apic.c +--- linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -617,7 +617,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries =3D kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_KERNEL); @@ -10715,9 +10714,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/apic/io= _apic.c linux-2.6.38.3/arch/x86 { raw_spin_unlock(&vector_lock); } -diff -urNp linux-2.6.38.3/arch/x86/kernel/apm_32.c linux-2.6.38.3/arch/x= 86/kernel/apm_32.c ---- linux-2.6.38.3/arch/x86/kernel/apm_32.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/apm_32.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/apm_32.c linux-2.6.38.4/arch/x= 86/kernel/apm_32.c +--- linux-2.6.38.4/arch/x86/kernel/apm_32.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/apm_32.c 2011-04-23 12:47:27.00000000= 0 -0400 @@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. @@ -10782,28 +10781,7 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/apm_32= .c linux-2.6.38.3/arch/x86/kerne 0xb8, 0x00, 0x10, /* movw $0x1000,ax */ 0x8e, 0xd0, /* movw ax,ss */ 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */ -@@ -1932,7 +1946,10 @@ static const struct file_operations apm_ - static struct miscdevice apm_device =3D { - APM_MINOR_DEV, - "apm_bios", -- &apm_bios_fops -+ &apm_bios_fops, -+ {NULL, NULL}, -+ NULL, -+ NULL - }; -=20 -=20 -@@ -2253,7 +2270,7 @@ static struct dmi_system_id __initdata a - { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, - }, -=20 -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} - }; -=20 - /* -@@ -2356,12 +2373,15 @@ static int __init apm_init(void) +@@ -2356,12 +2370,15 @@ static int __init apm_init(void) * code to that CPU. */ gdt =3D get_cpu_gdt_table(0); @@ -10819,9 +10797,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/apm_32.= c linux-2.6.38.3/arch/x86/kerne =20 proc_create("apm", 0, NULL, &apm_file_ops); =20 -diff -urNp linux-2.6.38.3/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.= 3/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.38.3/arch/x86/kernel/asm-offsets_32.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/asm-offsets_32.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.= 4/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -51,7 +51,6 @@ void foo(void) OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id); BLANK(); @@ -10842,9 +10820,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/asm-off= sets_32.c linux-2.6.38.3/arch/x #endif =20 #ifdef CONFIG_XEN -diff -urNp linux-2.6.38.3/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.= 3/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.38.3/arch/x86/kernel/asm-offsets_64.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/asm-offsets_64.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.= 4/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -63,6 +63,18 @@ int main(void) OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); @@ -10872,10 +10850,10 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/asm-o= ffsets_64.c linux-2.6.38.3/arch/x DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/amd.c linux-2.6.38.3/arch/= x86/kernel/cpu/amd.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/amd.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/amd.c 2011-04-17 15:57:32.0000000= 00 -0400 -@@ -601,7 +601,7 @@ static unsigned int __cpuinit amd_size_c +diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/amd.c linux-2.6.38.4/arch/= x86/kernel/cpu/amd.c +--- linux-2.6.38.4/arch/x86/kernel/cpu/amd.c 2011-04-22 19:20:59.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/cpu/amd.c 2011-04-22 19:21:10.0000000= 00 -0400 +@@ -624,7 +624,7 @@ static unsigned int __cpuinit amd_size_c unsigned int size) { /* AMD errata T13 (order #21922) */ @@ -10884,9 +10862,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/amd= .c linux-2.6.38.3/arch/x86/kern /* Duron Rev A0 */ if (c->x86_model =3D=3D 3 && c->x86_mask =3D=3D 0) size =3D 64; -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/common.c linux-2.6.38.3/ar= ch/x86/kernel/cpu/common.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/common.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/common.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/common.c linux-2.6.38.4/ar= ch/x86/kernel/cpu/common.c +--- linux-2.6.38.4/arch/x86/kernel/cpu/common.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/cpu/common.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon =20 static const struct cpu_dev *this_cpu __cpuinitdata =3D &default_cpu; @@ -11031,33 +11009,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/co= mmon.c linux-2.6.38.3/arch/x86/k struct thread_struct *thread =3D &curr->thread; =20 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c lin= ux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-03-14= 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-04-17= 15:57:32.000000000 -0400 -@@ -481,7 +481,7 @@ static const struct dmi_system_id sw_any - DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino= .c linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011= -03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011= -04-17 15:57:32.000000000 -0400 -@@ -226,7 +226,7 @@ static struct cpu_model models[] =3D - { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, - { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, -=20 -- { NULL, } -+ { NULL, NULL, 0, NULL} - }; - #undef _BANIAS - #undef BANIAS -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/intel.c linux-2.6.38.3/arc= h/x86/kernel/cpu/intel.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/intel.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/intel.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/intel.c linux-2.6.38.4/arc= h/x86/kernel/cpu/intel.c +--- linux-2.6.38.4/arch/x86/kernel/cpu/intel.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/cpu/intel.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. @@ -11067,9 +11021,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/int= el.c linux-2.6.38.3/arch/x86/ke load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/Makefile linux-2.6.38.3/ar= ch/x86/kernel/cpu/Makefile ---- linux-2.6.38.3/arch/x86/kernel/cpu/Makefile 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/Makefile 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/Makefile linux-2.6.38.4/ar= ch/x86/kernel/cpu/Makefile +--- linux-2.6.38.4/arch/x86/kernel/cpu/Makefile 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/cpu/Makefile 2011-04-17 15:57:32.0000= 00000 -0400 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o =3D -pg CFLAGS_REMOVE_perf_event.o =3D -pg endif @@ -11081,9 +11035,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/Mak= efile linux-2.6.38.3/arch/x86/k obj-y :=3D intel_cacheinfo.o scattered.o topology.o obj-y +=3D proc.o capflags.o powerflags.o common.o obj-y +=3D vmware.o hypervisor.o sched.o mshyperv.o -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.= 3/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.= 4/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-23 12:47:27.= 000000000 -0400 @@ -45,6 +45,7 @@ #include #include @@ -11146,29 +11100,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mc= heck/mce.c linux-2.6.38.3/arch/x .open =3D mce_open, .release =3D mce_release, .read =3D mce_read, -@@ -1673,6 +1673,7 @@ static struct miscdevice mce_log_device=20 - MISC_MCELOG_MINOR, - "mcelog", - &mce_chrdev_ops, -+ {NULL, NULL}, NULL, NULL - }; -=20 - /* -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.3= 8.3/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-17 15:57:3= 2.000000000 -0400 -@@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra - { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ - { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ - { MSR_MTRRfix4K_C0000, 8 }, /* eight 4k MTRRs */ -- {} -+ { 0, 0 } - }; -=20 - static unsigned long smp_changes_mask; -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.3= /arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/main.c 2011-04-18 17:27:18.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 16:53:16.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.4= /arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c 2011-04-18 17:27:18.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 16:53:16.0= 00000000 -0400 @@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -11178,9 +11112,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtr= r/main.c linux-2.6.38.3/arch/x8 =20 const struct mtrr_ops *mtrr_if; =20 -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.3= /arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.4= /arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; =20 @@ -11209,9 +11143,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtr= r/mtrr.h linux-2.6.38.3/arch/x8 }; =20 extern int generic_get_free_region(unsigned long base, unsigned long si= ze, -diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.= 3/arch/x86/kernel/cpu/perf_event.c ---- linux-2.6.38.3/arch/x86/kernel/cpu/perf_event.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/cpu/perf_event.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.= 4/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -1781,7 +1781,7 @@ perf_callchain_user(struct perf_callchai break; =20 @@ -11221,9 +11155,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/per= f_event.c linux-2.6.38.3/arch/x } } =20 -diff -urNp linux-2.6.38.3/arch/x86/kernel/crash.c linux-2.6.38.3/arch/x8= 6/kernel/crash.c ---- linux-2.6.38.3/arch/x86/kernel/crash.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/x86/kernel/crash.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/crash.c linux-2.6.38.4/arch/x8= 6/kernel/crash.c +--- linux-2.6.38.4/arch/x86/kernel/crash.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/x86/kernel/crash.c 2011-04-17 15:57:32.000000000= -0400 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,=20 regs =3D args->regs; =20 @@ -11233,9 +11167,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/crash.c= linux-2.6.38.3/arch/x86/kernel crash_fixup_ss_esp(&fixed_regs, regs); regs =3D &fixed_regs; } -diff -urNp linux-2.6.38.3/arch/x86/kernel/doublefault_32.c linux-2.6.38.= 3/arch/x86/kernel/doublefault_32.c ---- linux-2.6.38.3/arch/x86/kernel/doublefault_32.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/doublefault_32.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/doublefault_32.c linux-2.6.38.= 4/arch/x86/kernel/doublefault_32.c +--- linux-2.6.38.4/arch/x86/kernel/doublefault_32.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/doublefault_32.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -11,7 +11,7 @@ =20 #define DOUBLEFAULT_STACKSIZE (1024) @@ -11267,9 +11201,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/doublef= ault_32.c linux-2.6.38.3/arch/x .fs =3D __KERNEL_PERCPU, =20 .__cr3 =3D __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack_32.c linux-2.6.38.3/= arch/x86/kernel/dumpstack_32.c ---- linux-2.6.38.3/arch/x86/kernel/dumpstack_32.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c linux-2.6.38.4/= arch/x86/kernel/dumpstack_32.c +--- linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -37,15 +37,12 @@ void dump_trace(struct task_struct *task =20 bp =3D stack_frame(task, regs); @@ -11333,9 +11267,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpsta= ck_32.c linux-2.6.38.3/arch/x86 if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack_64.c linux-2.6.38.3/= arch/x86/kernel/dumpstack_64.c ---- linux-2.6.38.3/arch/x86/kernel/dumpstack_64.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c linux-2.6.38.4/= arch/x86/kernel/dumpstack_64.c +--- linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -147,10 +147,10 @@ void dump_trace(struct task_struct *task unsigned long *irq_stack_end =3D (unsigned long *)per_cpu(irq_stack_ptr, cpu); @@ -11388,9 +11322,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpsta= ck_64.c linux-2.6.38.3/arch/x86 put_cpu(); } EXPORT_SYMBOL(dump_trace); -diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack.c linux-2.6.38.3/arc= h/x86/kernel/dumpstack.c ---- linux-2.6.38.3/arch/x86/kernel/dumpstack.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/dumpstack.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack.c linux-2.6.38.4/arc= h/x86/kernel/dumpstack.c +--- linux-2.6.38.4/arch/x86/kernel/dumpstack.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/dumpstack.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -2,6 +2,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs @@ -11543,9 +11477,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpsta= ck.c linux-2.6.38.3/arch/x86/ke report_bug(regs->ip, regs); =20 if (__die(str, regs, err)) -diff -urNp linux-2.6.38.3/arch/x86/kernel/entry_32.S linux-2.6.38.3/arch= /x86/kernel/entry_32.S ---- linux-2.6.38.3/arch/x86/kernel/entry_32.S 2011-04-18 17:27:16.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/entry_32.S 2011-04-19 17:17:51.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch= /x86/kernel/entry_32.S +--- linux-2.6.38.4/arch/x86/kernel/entry_32.S 2011-04-18 17:27:16.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/entry_32.S 2011-04-19 17:17:51.000000= 000 -0400 @@ -183,13 +183,81 @@ /*CFI_REL_OFFSET gs, PT_GS*/ .endm @@ -11923,9 +11857,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/entry_3= 2.S linux-2.6.38.3/arch/x86/ker RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.38.3/arch/x86/kernel/entry_64.S linux-2.6.38.3/arch= /x86/kernel/entry_64.S ---- linux-2.6.38.3/arch/x86/kernel/entry_64.S 2011-04-18 17:27:13.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/entry_64.S 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch= /x86/kernel/entry_64.S +--- linux-2.6.38.4/arch/x86/kernel/entry_64.S 2011-04-18 17:27:13.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/entry_64.S 2011-04-17 15:57:32.000000= 000 -0400 @@ -53,6 +53,7 @@ #include #include @@ -12425,9 +12359,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/entry_6= 4.S linux-2.6.38.3/arch/x86/ker RESTORE_ALL 8 jmp irq_return nmi_userspace: -diff -urNp linux-2.6.38.3/arch/x86/kernel/ftrace.c linux-2.6.38.3/arch/x= 86/kernel/ftrace.c ---- linux-2.6.38.3/arch/x86/kernel/ftrace.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/ftrace.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/ftrace.c linux-2.6.38.4/arch/x= 86/kernel/ftrace.c +--- linux-2.6.38.4/arch/x86/kernel/ftrace.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/ftrace.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -177,7 +177,9 @@ void ftrace_nmi_enter(void) =20 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { @@ -12465,9 +12399,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/ftrace.= c linux-2.6.38.3/arch/x86/kerne if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; =20 -diff -urNp linux-2.6.38.3/arch/x86/kernel/head32.c linux-2.6.38.3/arch/x= 86/kernel/head32.c ---- linux-2.6.38.3/arch/x86/kernel/head32.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/head32.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/head32.c linux-2.6.38.4/arch/x= 86/kernel/head32.c +--- linux-2.6.38.4/arch/x86/kernel/head32.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/head32.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -19,6 +19,7 @@ #include #include @@ -12485,9 +12419,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/head32.= c linux-2.6.38.3/arch/x86/kerne =20 #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.38.3/arch/x86/kernel/head_32.S linux-2.6.38.3/arch/= x86/kernel/head_32.S ---- linux-2.6.38.3/arch/x86/kernel/head_32.S 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/head_32.S 2011-04-17 16:02:16.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/head_32.S linux-2.6.38.4/arch/= x86/kernel/head_32.S +--- linux-2.6.38.4/arch/x86/kernel/head_32.S 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/head_32.S 2011-04-17 16:02:16.0000000= 00 -0400 @@ -25,6 +25,12 @@ /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET) @@ -12922,9 +12856,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/head_32= .S linux-2.6.38.3/arch/x86/kern + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.38.3/arch/x86/kernel/head_64.S linux-2.6.38.3/arch/= x86/kernel/head_64.S ---- linux-2.6.38.3/arch/x86/kernel/head_64.S 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/head_64.S 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/head_64.S linux-2.6.38.4/arch/= x86/kernel/head_64.S +--- linux-2.6.38.4/arch/x86/kernel/head_64.S 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/head_64.S 2011-04-17 15:57:32.0000000= 00 -0400 @@ -19,6 +19,7 @@ #include #include @@ -13194,9 +13128,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/head_64= .S linux-2.6.38.3/arch/x86/kern =20 __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.38.3/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.3= /arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.38.3/arch/x86/kernel/i386_ksyms_32.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.4= /arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -13218,9 +13152,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/i386_ks= yms_32.c linux-2.6.38.3/arch/x8 +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.38.3/arch/x86/kernel/init_task.c linux-2.6.38.3/arc= h/x86/kernel/init_task.c ---- linux-2.6.38.3/arch/x86/kernel/init_task.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/init_task.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/init_task.c linux-2.6.38.4/arc= h/x86/kernel/init_task.c +--- linux-2.6.38.4/arch/x86/kernel/init_task.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/init_task.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan * way process stacks are handled. This is done by having a special * "init_task" linker map entry.. @@ -13239,9 +13173,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/init_ta= sk.c linux-2.6.38.3/arch/x86/ke - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_s= mp =3D { [0 ... NR_CPUS-1] =3D INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.38.3/arch/x86/kernel/ioport.c linux-2.6.38.3/arch/x= 86/kernel/ioport.c ---- linux-2.6.38.3/arch/x86/kernel/ioport.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/ioport.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/ioport.c linux-2.6.38.4/arch/x= 86/kernel/ioport.c +--- linux-2.6.38.4/arch/x86/kernel/ioport.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/ioport.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -6,6 +6,7 @@ #include #include @@ -13285,9 +13219,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/ioport.= c linux-2.6.38.3/arch/x86/kerne if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-2.6.38.3/arch/x86/kernel/irq_32.c linux-2.6.38.3/arch/x= 86/kernel/irq_32.c ---- linux-2.6.38.3/arch/x86/kernel/irq_32.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/irq_32.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/irq_32.c linux-2.6.38.4/arch/x= 86/kernel/irq_32.c +--- linux-2.6.38.4/arch/x86/kernel/irq_32.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/irq_32.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -36,7 +36,7 @@ static int check_stack_overflow(void) __asm__ __volatile__("andl %%esp,%0" : "=3Dr" (sp) : "0" (THREAD_SIZE - 1)); @@ -13429,9 +13363,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/irq_32.= c linux-2.6.38.3/arch/x86/kerne /* * Shouldnt happen, we returned above if in_interrupt(): */ -diff -urNp linux-2.6.38.3/arch/x86/kernel/kgdb.c linux-2.6.38.3/arch/x86= /kernel/kgdb.c ---- linux-2.6.38.3/arch/x86/kernel/kgdb.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/kernel/kgdb.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/kgdb.c linux-2.6.38.4/arch/x86= /kernel/kgdb.c +--- linux-2.6.38.4/arch/x86/kernel/kgdb.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/kernel/kgdb.c 2011-04-17 15:57:32.000000000 = -0400 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem,=20 switch (regno) { #ifdef CONFIG_X86_32 @@ -13455,9 +13389,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/kgdb.c = linux-2.6.38.3/arch/x86/kernel/ /* Breakpoint instruction: */ .gdb_bpt_instr =3D { 0xcc }, .flags =3D KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.38.3/arch/x86/kernel/kprobes.c linux-2.6.38.3/arch/= x86/kernel/kprobes.c ---- linux-2.6.38.3/arch/x86/kernel/kprobes.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/kprobes.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/kprobes.c linux-2.6.38.4/arch/= x86/kernel/kprobes.c +--- linux-2.6.38.4/arch/x86/kernel/kprobes.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/kprobes.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat } __attribute__((packed)) *insn; =20 @@ -13591,9 +13525,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/kprobes= .c linux-2.6.38.3/arch/x86/kern RELATIVE_ADDR_SIZE); =20 insn_buf[0] =3D RELATIVEJUMP_OPCODE; -diff -urNp linux-2.6.38.3/arch/x86/kernel/ldt.c linux-2.6.38.3/arch/x86/= kernel/ldt.c ---- linux-2.6.38.3/arch/x86/kernel/ldt.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/kernel/ldt.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/ldt.c linux-2.6.38.4/arch/x86/= kernel/ldt.c +--- linux-2.6.38.4/arch/x86/kernel/ldt.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/kernel/ldt.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -13658,9 +13592,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/ldt.c l= inux-2.6.38.3/arch/x86/kernel/l fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl =3D 0; -diff -urNp linux-2.6.38.3/arch/x86/kernel/machine_kexec_32.c linux-2.6.3= 8.3/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.38.3/arch/x86/kernel/machine_kexec_32.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.3= 8.4/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:57:3= 2.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -13688,9 +13622,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/machine= _kexec_32.c linux-2.6.38.3/arch =20 relocate_kernel_ptr =3D control_page; page_list[PA_CONTROL_PAGE] =3D __pa(control_page); -diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_amd.c linux-2.6.38.3= /arch/x86/kernel/microcode_amd.c ---- linux-2.6.38.3/arch/x86/kernel/microcode_amd.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/microcode_amd.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_amd.c linux-2.6.38.4= /arch/x86/kernel/microcode_amd.c +--- linux-2.6.38.4/arch/x86/kernel/microcode_amd.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/microcode_amd.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -317,7 +317,7 @@ static void microcode_fini_cpu_amd(int c uci->mc =3D NULL; } @@ -13709,9 +13643,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/microco= de_amd.c linux-2.6.38.3/arch/x8 { return µcode_amd_ops; } -diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_core.c linux-2.6.38.= 3/arch/x86/kernel/microcode_core.c ---- linux-2.6.38.3/arch/x86/kernel/microcode_core.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/microcode_core.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_core.c linux-2.6.38.= 4/arch/x86/kernel/microcode_core.c +--- linux-2.6.38.4/arch/x86/kernel/microcode_core.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/microcode_core.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -92,7 +92,7 @@ MODULE_LICENSE("GPL"); =20 #define MICROCODE_VERSION "2.00" @@ -13721,9 +13655,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/microco= de_core.c linux-2.6.38.3/arch/x =20 /* * Synchronization. -diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_intel.c linux-2.6.38= .3/arch/x86/kernel/microcode_intel.c ---- linux-2.6.38.3/arch/x86/kernel/microcode_intel.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/microcode_intel.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_intel.c linux-2.6.38= .4/arch/x86/kernel/microcode_intel.c +--- linux-2.6.38.4/arch/x86/kernel/microcode_intel.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/microcode_intel.c 2011-04-17 15:57:32= .000000000 -0400 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod =20 static int get_ucode_user(void *to, const void *from, size_t n) @@ -13758,9 +13692,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/microco= de_intel.c linux-2.6.38.3/arch/ { return µcode_intel_ops; } -diff -urNp linux-2.6.38.3/arch/x86/kernel/module.c linux-2.6.38.3/arch/x= 86/kernel/module.c ---- linux-2.6.38.3/arch/x86/kernel/module.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/module.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/module.c linux-2.6.38.4/arch/x= 86/kernel/module.c +--- linux-2.6.38.4/arch/x86/kernel/module.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/module.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -35,21 +35,66 @@ #define DEBUGP(fmt...) #endif @@ -13899,9 +13833,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/module.= c linux-2.6.38.3/arch/x86/kerne #if 0 if ((s64)val !=3D *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.38.3/arch/x86/kernel/paravirt.c linux-2.6.38.3/arch= /x86/kernel/paravirt.c ---- linux-2.6.38.3/arch/x86/kernel/paravirt.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/paravirt.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt.c linux-2.6.38.4/arch= /x86/kernel/paravirt.c +--- linux-2.6.38.4/arch/x86/kernel/paravirt.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/paravirt.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * corresponding structure. */ static void *get_call_destination(u8 type) @@ -14005,9 +13939,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/paravir= t.c linux-2.6.38.3/arch/x86/ker }; =20 EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.38.3/arch/x86/kernel/paravirt-spinlocks.c linux-2.6= .38.3/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.38.3/arch/x86/kernel/paravirt-spinlocks.c 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6= .38.4/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:57= :32.000000000 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t=20 arch_spin_lock(lock); } @@ -14017,9 +13951,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/paravir= t-spinlocks.c linux-2.6.38.3/ar #ifdef CONFIG_SMP .spin_is_locked =3D __ticket_spin_is_locked, .spin_is_contended =3D __ticket_spin_is_contended, -diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.= 3/arch/x86/kernel/pci-calgary_64.c ---- linux-2.6.38.3/arch/x86/kernel/pci-calgary_64.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.= 4/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -476,7 +476,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -14029,9 +13963,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-cal= gary_64.c linux-2.6.38.3/arch/x .alloc_coherent =3D calgary_alloc_coherent, .free_coherent =3D calgary_free_coherent, .map_sg =3D calgary_map_sg, -diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-dma.c linux-2.6.38.3/arch/= x86/kernel/pci-dma.c ---- linux-2.6.38.3/arch/x86/kernel/pci-dma.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/pci-dma.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-dma.c linux-2.6.38.4/arch/= x86/kernel/pci-dma.c +--- linux-2.6.38.4/arch/x86/kernel/pci-dma.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/pci-dma.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -16,7 +16,7 @@ =20 static int forbid_dac __read_mostly; @@ -14050,9 +13984,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-dma= .c linux-2.6.38.3/arch/x86/kern =20 #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-gart_64.c linux-2.6.38.3/a= rch/x86/kernel/pci-gart_64.c ---- linux-2.6.38.3/arch/x86/kernel/pci-gart_64.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c linux-2.6.38.4/a= rch/x86/kernel/pci-gart_64.c +--- linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -706,7 +706,7 @@ static __init int init_amd_gatt(struct a return -1; } @@ -14062,9 +13996,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-gar= t_64.c linux-2.6.38.3/arch/x86/ .map_sg =3D gart_map_sg, .unmap_sg =3D gart_unmap_sg, .map_page =3D gart_map_page, -diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-nommu.c linux-2.6.38.3/arc= h/x86/kernel/pci-nommu.c ---- linux-2.6.38.3/arch/x86/kernel/pci-nommu.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/pci-nommu.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-nommu.c linux-2.6.38.4/arc= h/x86/kernel/pci-nommu.c +--- linux-2.6.38.4/arch/x86/kernel/pci-nommu.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/pci-nommu.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -14074,9 +14008,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-nom= mu.c linux-2.6.38.3/arch/x86/ke .alloc_coherent =3D dma_generic_alloc_coherent, .free_coherent =3D nommu_free_coherent, .map_sg =3D nommu_map_sg, -diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.3/a= rch/x86/kernel/pci-swiotlb.c ---- linux-2.6.38.3/arch/x86/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.4/a= rch/x86/kernel/pci-swiotlb.c +--- linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -14086,9 +14020,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-swi= otlb.c linux-2.6.38.3/arch/x86/ .mapping_error =3D swiotlb_dma_mapping_error, .alloc_coherent =3D x86_swiotlb_alloc_coherent, .free_coherent =3D swiotlb_free_coherent, -diff -urNp linux-2.6.38.3/arch/x86/kernel/process_32.c linux-2.6.38.3/ar= ch/x86/kernel/process_32.c ---- linux-2.6.38.3/arch/x86/kernel/process_32.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/process_32.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/process_32.c linux-2.6.38.4/ar= ch/x86/kernel/process_32.c +--- linux-2.6.38.4/arch/x86/kernel/process_32.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/process_32.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -14168,9 +14102,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/process= _32.c linux-2.6.38.3/arch/x86/k return 0; } - -diff -urNp linux-2.6.38.3/arch/x86/kernel/process_64.c linux-2.6.38.3/ar= ch/x86/kernel/process_64.c ---- linux-2.6.38.3/arch/x86/kernel/process_64.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/process_64.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/process_64.c linux-2.6.38.4/ar= ch/x86/kernel/process_64.c +--- linux-2.6.38.4/arch/x86/kernel/process_64.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/process_64.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -87,7 +87,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -14227,9 +14161,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/process= _64.c linux-2.6.38.3/arch/x86/k return 0; ip =3D *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.38.3/arch/x86/kernel/process.c linux-2.6.38.3/arch/= x86/kernel/process.c ---- linux-2.6.38.3/arch/x86/kernel/process.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/process.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/process.c linux-2.6.38.4/arch/= x86/kernel/process.c +--- linux-2.6.38.4/arch/x86/kernel/process.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/process.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru =20 void free_thread_info(struct thread_info *ti) @@ -14352,9 +14286,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/process= .c linux-2.6.38.3/arch/x86/kern +#endif +} +#endif -diff -urNp linux-2.6.38.3/arch/x86/kernel/ptrace.c linux-2.6.38.3/arch/x= 86/kernel/ptrace.c ---- linux-2.6.38.3/arch/x86/kernel/ptrace.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/ptrace.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/ptrace.c linux-2.6.38.4/arch/x= 86/kernel/ptrace.c +--- linux-2.6.38.4/arch/x86/kernel/ptrace.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/ptrace.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *chi unsigned long addr, unsigned long data) { @@ -14408,9 +14342,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/ptrace.= c linux-2.6.38.3/arch/x86/kerne { bool step; =20 -diff -urNp linux-2.6.38.3/arch/x86/kernel/reboot.c linux-2.6.38.3/arch/x= 86/kernel/reboot.c ---- linux-2.6.38.3/arch/x86/kernel/reboot.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/reboot.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/reboot.c linux-2.6.38.4/arch/x= 86/kernel/reboot.c +--- linux-2.6.38.4/arch/x86/kernel/reboot.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/reboot.c 2011-04-23 12:47:27.00000000= 0 -0400 @@ -34,7 +34,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); =20 @@ -14420,15 +14354,6 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/reboot= .c linux-2.6.38.3/arch/x86/kerne enum reboot_type reboot_type =3D BOOT_KBD; int reboot_force; =20 -@@ -293,7 +293,7 @@ static struct dmi_system_id __initdata r - DMI_MATCH(DMI_BOARD_NAME, "VersaLogic Menlow board"), - }, - }, -- { } -+ { NULL, NULL, {{0, {0}}}, NULL} - }; -=20 - static int __init reboot_init(void) @@ -309,12 +309,12 @@ core_initcall(reboot_init); controller to pulse the CPU reset line, which is more thorough, but doesn't work with at least one type of 486 motherboard. It is easy @@ -14476,9 +14401,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/reboot.= c linux-2.6.38.3/arch/x86/kerne =20 /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.38.3/arch/x86/kernel/setup.c linux-2.6.38.3/arch/x8= 6/kernel/setup.c ---- linux-2.6.38.3/arch/x86/kernel/setup.c 2011-04-18 17:27:18.000000000= -0400 -+++ linux-2.6.38.3/arch/x86/kernel/setup.c 2011-04-17 16:53:16.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/setup.c linux-2.6.38.4/arch/x8= 6/kernel/setup.c +--- linux-2.6.38.4/arch/x86/kernel/setup.c 2011-04-18 17:27:18.000000000= -0400 ++++ linux-2.6.38.4/arch/x86/kernel/setup.c 2011-04-17 16:53:16.000000000= -0400 @@ -654,7 +654,7 @@ static void __init trim_bios_range(void) * area (640->1Mb) as ram even though it is not. * take them out. @@ -14508,9 +14433,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/setup.c= linux-2.6.38.3/arch/x86/kernel data_resource.end =3D virt_to_phys(_edata)-1; bss_resource.start =3D virt_to_phys(&__bss_start); bss_resource.end =3D virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.38.3/arch/x86/kernel/setup_percpu.c linux-2.6.38.3/= arch/x86/kernel/setup_percpu.c ---- linux-2.6.38.3/arch/x86/kernel/setup_percpu.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/setup_percpu.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/setup_percpu.c linux-2.6.38.4/= arch/x86/kernel/setup_percpu.c +--- linux-2.6.38.4/arch/x86/kernel/setup_percpu.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/setup_percpu.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -21,19 +21,17 @@ #include #include @@ -14574,9 +14499,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/setup_p= ercpu.c linux-2.6.38.3/arch/x86 /* * Up to this point, the boot CPU has been using .init.data * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.38.3/arch/x86/kernel/signal.c linux-2.6.38.3/arch/x= 86/kernel/signal.c ---- linux-2.6.38.3/arch/x86/kernel/signal.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/signal.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/signal.c linux-2.6.38.4/arch/x= 86/kernel/signal.c +--- linux-2.6.38.4/arch/x86/kernel/signal.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/signal.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) =3D=3D 0. @@ -14651,9 +14576,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/signal.= c linux-2.6.38.3/arch/x86/kerne return; =20 if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.38.3/arch/x86/kernel/smpboot.c linux-2.6.38.3/arch/= x86/kernel/smpboot.c ---- linux-2.6.38.3/arch/x86/kernel/smpboot.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/smpboot.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/smpboot.c linux-2.6.38.4/arch/= x86/kernel/smpboot.c +--- linux-2.6.38.4/arch/x86/kernel/smpboot.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/smpboot.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -773,17 +773,20 @@ static int __cpuinit do_boot_cpu(int api set_idle_for_cpu(cpu, c_idle.idle); do_rest: @@ -14691,9 +14616,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/smpboot= .c linux-2.6.38.3/arch/x86/kern err =3D do_boot_cpu(apicid, cpu); if (err) { pr_debug("do_boot_cpu failed %d\n", err); -diff -urNp linux-2.6.38.3/arch/x86/kernel/step.c linux-2.6.38.3/arch/x86= /kernel/step.c ---- linux-2.6.38.3/arch/x86/kernel/step.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/kernel/step.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/step.c linux-2.6.38.4/arch/x86= /kernel/step.c +--- linux-2.6.38.4/arch/x86/kernel/step.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/kernel/step.c 2011-04-17 15:57:32.000000000 = -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -14736,17 +14661,17 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/step.= c linux-2.6.38.3/arch/x86/kernel/ /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.38.3/arch/x86/kernel/syscall_table_32.S linux-2.6.3= 8.3/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.38.3/arch/x86/kernel/syscall_table_32.S 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S linux-2.6.3= 8.4/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:57:3= 2.000000000 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for r= estarting */ .long sys_exit -diff -urNp linux-2.6.38.3/arch/x86/kernel/sys_i386_32.c linux-2.6.38.3/a= rch/x86/kernel/sys_i386_32.c ---- linux-2.6.38.3/arch/x86/kernel/sys_i386_32.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c linux-2.6.38.4/a= rch/x86/kernel/sys_i386_32.c +--- linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -24,17 +24,224 @@ =20 #include @@ -14984,9 +14909,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/sys_i38= 6_32.c linux-2.6.38.3/arch/x86/ + + return addr; } -diff -urNp linux-2.6.38.3/arch/x86/kernel/sys_x86_64.c linux-2.6.38.3/ar= ch/x86/kernel/sys_x86_64.c ---- linux-2.6.38.3/arch/x86/kernel/sys_x86_64.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c linux-2.6.38.4/ar= ch/x86/kernel/sys_x86_64.c +--- linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -15124,9 +15049,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/sys_x86= _64.c linux-2.6.38.3/arch/x86/k mm->cached_hole_size =3D ~0UL; =20 return addr; -diff -urNp linux-2.6.38.3/arch/x86/kernel/time.c linux-2.6.38.3/arch/x86= /kernel/time.c ---- linux-2.6.38.3/arch/x86/kernel/time.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/kernel/time.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/time.c linux-2.6.38.4/arch/x86= /kernel/time.c +--- linux-2.6.38.4/arch/x86/kernel/time.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/kernel/time.c 2011-04-17 15:57:32.000000000 = -0400 @@ -22,17 +22,13 @@ #include #include @@ -15165,9 +15090,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/time.c = linux-2.6.38.3/arch/x86/kernel/ } return pc; } -diff -urNp linux-2.6.38.3/arch/x86/kernel/tls.c linux-2.6.38.3/arch/x86/= kernel/tls.c ---- linux-2.6.38.3/arch/x86/kernel/tls.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/kernel/tls.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/tls.c linux-2.6.38.4/arch/x86/= kernel/tls.c +--- linux-2.6.38.4/arch/x86/kernel/tls.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/kernel/tls.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; @@ -15180,9 +15105,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/tls.c l= inux-2.6.38.3/arch/x86/kernel/t set_tls_desc(p, idx, &info, 1); =20 return 0; -diff -urNp linux-2.6.38.3/arch/x86/kernel/trampoline_32.S linux-2.6.38.3= /arch/x86/kernel/trampoline_32.S ---- linux-2.6.38.3/arch/x86/kernel/trampoline_32.S 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/trampoline_32.S 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_32.S linux-2.6.38.4= /arch/x86/kernel/trampoline_32.S +--- linux-2.6.38.4/arch/x86/kernel/trampoline_32.S 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/trampoline_32.S 2011-04-17 15:57:32.0= 00000000 -0400 @@ -32,6 +32,12 @@ #include #include @@ -15205,9 +15130,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/trampol= ine_32.S linux-2.6.38.3/arch/x8 =20 # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -diff -urNp linux-2.6.38.3/arch/x86/kernel/trampoline_64.S linux-2.6.38.3= /arch/x86/kernel/trampoline_64.S ---- linux-2.6.38.3/arch/x86/kernel/trampoline_64.S 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/trampoline_64.S 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_64.S linux-2.6.38.4= /arch/x86/kernel/trampoline_64.S +--- linux-2.6.38.4/arch/x86/kernel/trampoline_64.S 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/trampoline_64.S 2011-04-17 15:57:32.0= 00000000 -0400 @@ -91,7 +91,7 @@ startup_32: movl $__KERNEL_DS, %eax # Initialize the %ds segment register movl %eax, %ds @@ -15226,9 +15151,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/trampol= ine_64.S linux-2.6.38.3/arch/x8 .long tgdt - r_base .short 0 .quad 0x00cf9b000000ffff # __KERNEL32_CS -diff -urNp linux-2.6.38.3/arch/x86/kernel/traps.c linux-2.6.38.3/arch/x8= 6/kernel/traps.c ---- linux-2.6.38.3/arch/x86/kernel/traps.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/x86/kernel/traps.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/traps.c linux-2.6.38.4/arch/x8= 6/kernel/traps.c +--- linux-2.6.38.4/arch/x86/kernel/traps.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/x86/kernel/traps.c 2011-04-17 15:57:32.000000000= -0400 @@ -70,12 +70,6 @@ asmlinkage int system_call(void); =20 /* Do we ignore FPU interrupts ? */ @@ -15390,21 +15315,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/traps.= c linux-2.6.38.3/arch/x86/kernel =20 if (!tsk_used_math(tsk)) { local_irq_enable(); -diff -urNp linux-2.6.38.3/arch/x86/kernel/tsc.c linux-2.6.38.3/arch/x86/= kernel/tsc.c ---- linux-2.6.38.3/arch/x86/kernel/tsc.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/kernel/tsc.c 2011-04-17 15:57:32.000000000 -= 0400 -@@ -837,7 +837,7 @@ static struct dmi_system_id __initdata b - DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), - }, - }, -- {} -+ { NULL, NULL, {{0, {0}}}, NULL} - }; -=20 - static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.38.3/arch/x86/kernel/vm86_32.c linux-2.6.38.3/arch/= x86/kernel/vm86_32.c ---- linux-2.6.38.3/arch/x86/kernel/vm86_32.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/vm86_32.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/vm86_32.c linux-2.6.38.4/arch/= x86/kernel/vm86_32.c +--- linux-2.6.38.4/arch/x86/kernel/vm86_32.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/vm86_32.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -41,6 +41,7 @@ #include #include @@ -15469,9 +15382,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/vm86_32= .c linux-2.6.38.3/arch/x86/kern if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) =3D=3D BIOSSEG) -diff -urNp linux-2.6.38.3/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.3/a= rch/x86/kernel/vmlinux.lds.S ---- linux-2.6.38.3/arch/x86/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.4/a= rch/x86/kernel/vmlinux.lds.S +--- linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:57:32.000= 000000 -0400 @@ -26,6 +26,13 @@ #include #include @@ -15768,9 +15681,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/vmlinux= .lds.S linux-2.6.38.3/arch/x86/ "kernel image bigger than KERNEL_IMAGE_SIZE"); =20 #ifdef CONFIG_SMP -diff -urNp linux-2.6.38.3/arch/x86/kernel/vsyscall_64.c linux-2.6.38.3/a= rch/x86/kernel/vsyscall_64.c ---- linux-2.6.38.3/arch/x86/kernel/vsyscall_64.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/vsyscall_64.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c linux-2.6.38.4/a= rch/x86/kernel/vsyscall_64.c +--- linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa =20 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -15788,9 +15701,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/vsyscal= l_64.c linux-2.6.38.3/arch/x86/ p =3D tcache->blob[1]; } else if (__vgetcpu_mode =3D=3D VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ -diff -urNp linux-2.6.38.3/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.= 3/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.38.3/arch/x86/kernel/x8664_ksyms_64.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.= 4/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic_string); EXPORT_SYMBOL(copy_user_generic_unrolled); @@ -15800,9 +15713,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/x8664_k= syms_64.c linux-2.6.38.3/arch/x =20 EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(clear_page); -diff -urNp linux-2.6.38.3/arch/x86/kernel/xsave.c linux-2.6.38.3/arch/x8= 6/kernel/xsave.c ---- linux-2.6.38.3/arch/x86/kernel/xsave.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/x86/kernel/xsave.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/x86/kernel/xsave.c linux-2.6.38.4/arch/x8= 6/kernel/xsave.c +--- linux-2.6.38.4/arch/x86/kernel/xsave.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/x86/kernel/xsave.c 2011-04-17 15:57:32.000000000= -0400 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -EINVAL; @@ -15830,9 +15743,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/xsave.c= linux-2.6.38.3/arch/x86/kernel buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.38.3/arch/x86/kvm/emulate.c linux-2.6.38.3/arch/x86= /kvm/emulate.c ---- linux-2.6.38.3/arch/x86/kvm/emulate.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/kvm/emulate.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/kvm/emulate.c linux-2.6.38.4/arch/x86= /kvm/emulate.c +--- linux-2.6.38.4/arch/x86/kvm/emulate.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/kvm/emulate.c 2011-04-17 15:57:32.000000000 = -0400 @@ -88,7 +88,7 @@ #define Src2ImmByte (2<<29) #define Src2One (3<<29) @@ -15867,9 +15780,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/emulate.c = linux-2.6.38.3/arch/x86/kvm/emu switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \ -diff -urNp linux-2.6.38.3/arch/x86/kvm/lapic.c linux-2.6.38.3/arch/x86/k= vm/lapic.c ---- linux-2.6.38.3/arch/x86/kvm/lapic.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/arch/x86/kvm/lapic.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/arch/x86/kvm/lapic.c linux-2.6.38.4/arch/x86/k= vm/lapic.c +--- linux-2.6.38.4/arch/x86/kvm/lapic.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/arch/x86/kvm/lapic.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -53,7 +53,7 @@ #define APIC_BUS_CYCLE_NS 1 =20 @@ -15879,9 +15792,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/lapic.c li= nux-2.6.38.3/arch/x86/kvm/lapic =20 #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-2.6.38.3/arch/x86/kvm/svm.c linux-2.6.38.3/arch/x86/kvm= /svm.c ---- linux-2.6.38.3/arch/x86/kvm/svm.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/arch/x86/kvm/svm.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/arch/x86/kvm/svm.c linux-2.6.38.4/arch/x86/kvm= /svm.c +--- linux-2.6.38.4/arch/x86/kvm/svm.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/arch/x86/kvm/svm.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -3273,7 +3273,11 @@ static void reload_tss(struct kvm_vcpu * int cpu =3D raw_smp_processor_id(); =20 @@ -15903,9 +15816,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/svm.c linu= x-2.6.38.3/arch/x86/kvm/svm.c .cpu_has_kvm_support =3D has_svm, .disabled_by_bios =3D is_disabled, .hardware_setup =3D svm_hardware_setup, -diff -urNp linux-2.6.38.3/arch/x86/kvm/vmx.c linux-2.6.38.3/arch/x86/kvm= /vmx.c ---- linux-2.6.38.3/arch/x86/kvm/vmx.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/arch/x86/kvm/vmx.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/arch/x86/kvm/vmx.c linux-2.6.38.4/arch/x86/kvm= /vmx.c +--- linux-2.6.38.4/arch/x86/kvm/vmx.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/arch/x86/kvm/vmx.c 2011-04-23 12:47:27.000000000 -040= 0 @@ -725,7 +725,11 @@ static void reload_tss(void) struct desc_struct *descs; =20 @@ -15966,16 +15879,25 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/vmx.c li= nux-2.6.38.3/arch/x86/kvm/vmx.c : "cc", "memory" , R"ax", R"bx", R"di", R"si" #ifdef CONFIG_X86_64 -@@ -4091,7 +4109,7 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -4091,7 +4109,16 @@ static void vmx_vcpu_run(struct kvm_vcpu =20 vmx->idt_vectoring_info =3D vmcs_read32(IDT_VECTORING_INFO_FIELD); =20 - asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS)); + asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS)); ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ asm("mov %0, %%fs" : : "r"(__KERNEL_PERCPU)); ++#endif ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ __set_fs(current_thread_info()->addr_limit); ++#endif ++ vmx->launched =3D 1; =20 vmx->exit_reason =3D vmcs_read32(VM_EXIT_REASON); -@@ -4326,7 +4344,7 @@ static void vmx_set_supported_cpuid(u32=20 +@@ -4326,7 +4353,7 @@ static void vmx_set_supported_cpuid(u32=20 { } =20 @@ -15984,9 +15906,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/vmx.c linu= x-2.6.38.3/arch/x86/kvm/vmx.c .cpu_has_kvm_support =3D cpu_has_kvm_support, .disabled_by_bios =3D vmx_disabled_by_bios, .hardware_setup =3D hardware_setup, -diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c linux-2.6.38.3/arch/x86/kvm= /x86.c ---- linux-2.6.38.3/arch/x86/kvm/x86.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/arch/x86/kvm/x86.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/arch/x86/kvm/x86.c linux-2.6.38.4/arch/x86/kvm= /x86.c +--- linux-2.6.38.4/arch/x86/kvm/x86.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/arch/x86/kvm/x86.c 2011-04-23 12:47:27.000000000 -040= 0 @@ -93,7 +93,7 @@ static void update_cr8_intercept(struct=20 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -15996,77 +15918,6 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c lin= ux-2.6.38.3/arch/x86/kvm/x86.c EXPORT_SYMBOL_GPL(kvm_x86_ops); =20 int ignore_msrs =3D 0; -@@ -119,38 +119,38 @@ static struct kvm_shared_msrs_global __r - static DEFINE_PER_CPU(struct kvm_shared_msrs, shared_msrs); -=20 - struct kvm_stats_debugfs_item debugfs_entries[] =3D { -- { "pf_fixed", VCPU_STAT(pf_fixed) }, -- { "pf_guest", VCPU_STAT(pf_guest) }, -- { "tlb_flush", VCPU_STAT(tlb_flush) }, -- { "invlpg", VCPU_STAT(invlpg) }, -- { "exits", VCPU_STAT(exits) }, -- { "io_exits", VCPU_STAT(io_exits) }, -- { "mmio_exits", VCPU_STAT(mmio_exits) }, -- { "signal_exits", VCPU_STAT(signal_exits) }, -- { "irq_window", VCPU_STAT(irq_window_exits) }, -- { "nmi_window", VCPU_STAT(nmi_window_exits) }, -- { "halt_exits", VCPU_STAT(halt_exits) }, -- { "halt_wakeup", VCPU_STAT(halt_wakeup) }, -- { "hypercalls", VCPU_STAT(hypercalls) }, -- { "request_irq", VCPU_STAT(request_irq_exits) }, -- { "irq_exits", VCPU_STAT(irq_exits) }, -- { "host_state_reload", VCPU_STAT(host_state_reload) }, -- { "efer_reload", VCPU_STAT(efer_reload) }, -- { "fpu_reload", VCPU_STAT(fpu_reload) }, -- { "insn_emulation", VCPU_STAT(insn_emulation) }, -- { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail) }, -- { "irq_injections", VCPU_STAT(irq_injections) }, -- { "nmi_injections", VCPU_STAT(nmi_injections) }, -- { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped) }, -- { "mmu_pte_write", VM_STAT(mmu_pte_write) }, -- { "mmu_pte_updated", VM_STAT(mmu_pte_updated) }, -- { "mmu_pde_zapped", VM_STAT(mmu_pde_zapped) }, -- { "mmu_flooded", VM_STAT(mmu_flooded) }, -- { "mmu_recycled", VM_STAT(mmu_recycled) }, -- { "mmu_cache_miss", VM_STAT(mmu_cache_miss) }, -- { "mmu_unsync", VM_STAT(mmu_unsync) }, -- { "remote_tlb_flush", VM_STAT(remote_tlb_flush) }, -- { "largepages", VM_STAT(lpages) }, -+ { "pf_fixed", VCPU_STAT(pf_fixed), NULL }, -+ { "pf_guest", VCPU_STAT(pf_guest), NULL }, -+ { "tlb_flush", VCPU_STAT(tlb_flush), NULL }, -+ { "invlpg", VCPU_STAT(invlpg), NULL }, -+ { "exits", VCPU_STAT(exits), NULL }, -+ { "io_exits", VCPU_STAT(io_exits), NULL }, -+ { "mmio_exits", VCPU_STAT(mmio_exits), NULL }, -+ { "signal_exits", VCPU_STAT(signal_exits), NULL }, -+ { "irq_window", VCPU_STAT(irq_window_exits), NULL }, -+ { "nmi_window", VCPU_STAT(nmi_window_exits), NULL }, -+ { "halt_exits", VCPU_STAT(halt_exits), NULL }, -+ { "halt_wakeup", VCPU_STAT(halt_wakeup), NULL }, -+ { "hypercalls", VCPU_STAT(hypercalls), NULL }, -+ { "request_irq", VCPU_STAT(request_irq_exits), NULL }, -+ { "irq_exits", VCPU_STAT(irq_exits), NULL }, -+ { "host_state_reload", VCPU_STAT(host_state_reload), NULL }, -+ { "efer_reload", VCPU_STAT(efer_reload), NULL }, -+ { "fpu_reload", VCPU_STAT(fpu_reload), NULL }, -+ { "insn_emulation", VCPU_STAT(insn_emulation), NULL }, -+ { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail), NULL }, -+ { "irq_injections", VCPU_STAT(irq_injections), NULL }, -+ { "nmi_injections", VCPU_STAT(nmi_injections), NULL }, -+ { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped), NULL }, -+ { "mmu_pte_write", VM_STAT(mmu_pte_write), NULL }, -+ { "mmu_pte_updated", VM_STAT(mmu_pte_updated), NULL }, -+ { "mmu_pde_zapped", VM_STAT(mmu_pde_zapped), NULL }, -+ { "mmu_flooded", VM_STAT(mmu_flooded), NULL }, -+ { "mmu_recycled", VM_STAT(mmu_recycled), NULL }, -+ { "mmu_cache_miss", VM_STAT(mmu_cache_miss), NULL }, -+ { "mmu_unsync", VM_STAT(mmu_unsync), NULL }, -+ { "remote_tlb_flush", VM_STAT(remote_tlb_flush), NULL }, -+ { "largepages", VM_STAT(lpages), NULL }, - { NULL } - }; -=20 @@ -2023,6 +2023,8 @@ long kvm_arch_dev_ioctl(struct file *fil if (n < msr_list.nmsrs) goto out; @@ -16076,7 +15927,54 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c lin= ux-2.6.38.3/arch/x86/kvm/x86.c if (copy_to_user(user_msr_list->indices, &msrs_to_save, num_msrs_to_save * sizeof(u32))) goto out; -@@ -2499,7 +2501,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru +@@ -2190,15 +2192,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str + struct kvm_cpuid2 *cpuid, + struct kvm_cpuid_entry2 __user *entries) + { +- int r; ++ int r, i; +=20 + r =3D -E2BIG; + if (cpuid->nent > KVM_MAX_CPUID_ENTRIES) + goto out; + r =3D -EFAULT; +- if (copy_from_user(&vcpu->arch.cpuid_entries, entries, +- cpuid->nent * sizeof(struct kvm_cpuid_entry2))) ++ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_c= puid_entry2))) + goto out; ++ for (i =3D 0; i < cpuid->nent; ++i) { ++ struct kvm_cpuid_entry2 cpuid_entry; ++ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry))) ++ goto out; ++ vcpu->arch.cpuid_entries[i] =3D cpuid_entry; ++ } + vcpu->arch.cpuid_nent =3D cpuid->nent; + kvm_apic_set_version(vcpu); + kvm_x86_ops->cpuid_update(vcpu); +@@ -2213,15 +2220,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str + struct kvm_cpuid2 *cpuid, + struct kvm_cpuid_entry2 __user *entries) + { +- int r; ++ int r, i; +=20 + r =3D -E2BIG; + if (cpuid->nent < vcpu->arch.cpuid_nent) + goto out; + r =3D -EFAULT; +- if (copy_to_user(entries, &vcpu->arch.cpuid_entries, +- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) ++ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(s= truct kvm_cpuid_entry2))) + goto out; ++ for (i =3D 0; i < vcpu->arch.cpuid_nent; ++i) { ++ struct kvm_cpuid_entry2 cpuid_entry =3D vcpu->arch.cpuid_entries[i]; ++ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry))) ++ goto out; ++ } + return 0; +=20 + out: +@@ -2499,7 +2510,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { @@ -16085,7 +15983,7 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c linu= x-2.6.38.3/arch/x86/kvm/x86.c return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; -@@ -4687,10 +4689,10 @@ void kvm_after_handle_nmi(struct kvm_vcp +@@ -4687,10 +4698,10 @@ void kvm_after_handle_nmi(struct kvm_vcp } EXPORT_SYMBOL_GPL(kvm_after_handle_nmi); =20 @@ -16098,9 +15996,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c linu= x-2.6.38.3/arch/x86/kvm/x86.c =20 if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.38.3/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.3/= arch/x86/lib/atomic64_cx8_32.S ---- linux-2.6.38.3/arch/x86/lib/atomic64_cx8_32.S 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/atomic64_cx8_32.S 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.4/= arch/x86/lib/atomic64_cx8_32.S +--- linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S 2011-04-17 15:57:32.00= 0000000 -0400 @@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8) movl %edx, %ecx \ins\()l %esi, %ebx @@ -16181,9 +16079,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/atomic64_c= x8_32.S linux-2.6.38.3/arch/x86 LOCK_PREFIX cmpxchg8b (%esi) jne 1b -diff -urNp linux-2.6.38.3/arch/x86/lib/checksum_32.S linux-2.6.38.3/arch= /x86/lib/checksum_32.S ---- linux-2.6.38.3/arch/x86/lib/checksum_32.S 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/checksum_32.S 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/checksum_32.S linux-2.6.38.4/arch= /x86/lib/checksum_32.S +--- linux-2.6.38.4/arch/x86/lib/checksum_32.S 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/checksum_32.S 2011-04-17 15:57:32.000000= 000 -0400 @@ -28,7 +28,8 @@ #include #include @@ -16444,9 +16342,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/checksum_3= 2.S linux-2.6.38.3/arch/x86/lib =09 #undef ROUND #undef ROUND1 =09 -diff -urNp linux-2.6.38.3/arch/x86/lib/clear_page_64.S linux-2.6.38.3/ar= ch/x86/lib/clear_page_64.S ---- linux-2.6.38.3/arch/x86/lib/clear_page_64.S 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/clear_page_64.S 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/clear_page_64.S linux-2.6.38.4/ar= ch/x86/lib/clear_page_64.S +--- linux-2.6.38.4/arch/x86/lib/clear_page_64.S 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/clear_page_64.S 2011-04-17 15:57:32.0000= 00000 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) =20 #include @@ -16456,9 +16354,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/clear_page= _64.S linux-2.6.38.3/arch/x86/l 1: .byte 0xeb /* jmp */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.38.3/arch/x86/lib/copy_page_64.S linux-2.6.38.3/arc= h/x86/lib/copy_page_64.S ---- linux-2.6.38.3/arch/x86/lib/copy_page_64.S 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/copy_page_64.S 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/copy_page_64.S linux-2.6.38.4/arc= h/x86/lib/copy_page_64.S +--- linux-2.6.38.4/arch/x86/lib/copy_page_64.S 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/copy_page_64.S 2011-04-17 15:57:32.00000= 0000 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) =20 #include @@ -16468,9 +16366,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/copy_page_= 64.S linux-2.6.38.3/arch/x86/li 1: .byte 0xeb /* jmp */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.38.3/arch/x86/lib/copy_user_64.S linux-2.6.38.3/arc= h/x86/lib/copy_user_64.S ---- linux-2.6.38.3/arch/x86/lib/copy_user_64.S 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/copy_user_64.S 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_64.S linux-2.6.38.4/arc= h/x86/lib/copy_user_64.S +--- linux-2.6.38.4/arch/x86/lib/copy_user_64.S 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/copy_user_64.S 2011-04-17 15:57:32.00000= 0000 -0400 @@ -15,13 +15,14 @@ #include #include @@ -16527,9 +16425,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/copy_user_= 64.S linux-2.6.38.3/arch/x86/li movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.38.3/arch/x86/lib/copy_user_nocache_64.S linux-2.6.= 38.3/arch/x86/lib/copy_user_nocache_64.S ---- linux-2.6.38.3/arch/x86/lib/copy_user_nocache_64.S 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.= 38.4/arch/x86/lib/copy_user_nocache_64.S +--- linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:57:= 32.000000000 -0400 @@ -14,6 +14,7 @@ #include #include @@ -16554,9 +16452,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/copy_user_= nocache_64.S linux-2.6.38.3/arc cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION -diff -urNp linux-2.6.38.3/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.3= /arch/x86/lib/csum-wrappers_64.c ---- linux-2.6.38.3/arch/x86/lib/csum-wrappers_64.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/csum-wrappers_64.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.4= /arch/x86/lib/csum-wrappers_64.c +--- linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ len -=3D 2; } @@ -16575,9 +16473,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/csum-wrapp= ers_64.c linux-2.6.38.3/arch/x8 return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } -diff -urNp linux-2.6.38.3/arch/x86/lib/getuser.S linux-2.6.38.3/arch/x86= /lib/getuser.S ---- linux-2.6.38.3/arch/x86/lib/getuser.S 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/lib/getuser.S 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/getuser.S linux-2.6.38.4/arch/x86= /lib/getuser.S +--- linux-2.6.38.4/arch/x86/lib/getuser.S 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/lib/getuser.S 2011-04-17 15:57:32.000000000 = -0400 @@ -33,14 +33,35 @@ #include #include @@ -16683,9 +16581,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/getuser.S = linux-2.6.38.3/arch/x86/lib/get 4: movq -7(%_ASM_AX),%_ASM_DX xor %eax,%eax ret -diff -urNp linux-2.6.38.3/arch/x86/lib/insn.c linux-2.6.38.3/arch/x86/li= b/insn.c ---- linux-2.6.38.3/arch/x86/lib/insn.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/arch/x86/lib/insn.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/arch/x86/lib/insn.c linux-2.6.38.4/arch/x86/li= b/insn.c +--- linux-2.6.38.4/arch/x86/lib/insn.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/arch/x86/lib/insn.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -21,6 +21,11 @@ #include #include @@ -16709,9 +16607,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/insn.c lin= ux-2.6.38.3/arch/x86/lib/insn.c insn->x86_64 =3D x86_64 ? 1 : 0; insn->opnd_bytes =3D 4; if (x86_64) -diff -urNp linux-2.6.38.3/arch/x86/lib/mmx_32.c linux-2.6.38.3/arch/x86/= lib/mmx_32.c ---- linux-2.6.38.3/arch/x86/lib/mmx_32.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/lib/mmx_32.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/mmx_32.c linux-2.6.38.4/arch/x86/= lib/mmx_32.c +--- linux-2.6.38.4/arch/x86/lib/mmx_32.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/lib/mmx_32.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -17027,9 +16925,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/mmx_32.c l= inux-2.6.38.3/arch/x86/lib/mmx_ =20 from +=3D 64; to +=3D 64; -diff -urNp linux-2.6.38.3/arch/x86/lib/putuser.S linux-2.6.38.3/arch/x86= /lib/putuser.S ---- linux-2.6.38.3/arch/x86/lib/putuser.S 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/lib/putuser.S 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/putuser.S linux-2.6.38.4/arch/x86= /lib/putuser.S +--- linux-2.6.38.4/arch/x86/lib/putuser.S 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/lib/putuser.S 2011-04-17 15:57:32.000000000 = -0400 @@ -15,7 +15,8 @@ #include #include @@ -17167,9 +17065,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/putuser.S = linux-2.6.38.3/arch/x86/lib/put #endif xor %eax,%eax EXIT -diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_32.c linux-2.6.38.3/arch= /x86/lib/usercopy_32.c ---- linux-2.6.38.3/arch/x86/lib/usercopy_32.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/usercopy_32.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_32.c linux-2.6.38.4/arch= /x86/lib/usercopy_32.c +--- linux-2.6.38.4/arch/x86/lib/usercopy_32.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/usercopy_32.c 2011-04-23 21:36:15.000000= 000 -0400 @@ -43,7 +43,7 @@ do { \ __asm__ __volatile__( \ " testl %1,%1\n" \ @@ -17691,7 +17589,7 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_3= 2.c linux-2.6.38.3/arch/x86/lib return n; } EXPORT_SYMBOL(__copy_from_user_ll_nozero); -@@ -827,65 +943,49 @@ unsigned long __copy_from_user_ll_nocach +@@ -827,65 +943,50 @@ unsigned long __copy_from_user_ll_nocach if (n > 64 && cpu_has_xmm2) n =3D __copy_user_intel_nocache(to, from, n); else @@ -17781,6 +17679,7 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_3= 2.c linux-2.6.38.3/arch/x86/lib + return; } -EXPORT_SYMBOL(copy_from_user_overflow); ++EXPORT_SYMBOL(__set_fs); + +void set_fs(mm_segment_t x) +{ @@ -17789,9 +17688,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_3= 2.c linux-2.6.38.3/arch/x86/lib +} +EXPORT_SYMBOL(set_fs); +#endif -diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_64.c linux-2.6.38.3/arch= /x86/lib/usercopy_64.c ---- linux-2.6.38.3/arch/x86/lib/usercopy_64.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/lib/usercopy_64.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_64.c linux-2.6.38.4/arch= /x86/lib/usercopy_64.c +--- linux-2.6.38.4/arch/x86/lib/usercopy_64.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/lib/usercopy_64.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -42,6 +42,8 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -17828,9 +17727,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_6= 4.c linux-2.6.38.3/arch/x86/lib } EXPORT_SYMBOL(copy_in_user); =20 -diff -urNp linux-2.6.38.3/arch/x86/Makefile linux-2.6.38.3/arch/x86/Make= file ---- linux-2.6.38.3/arch/x86/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/Makefile 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/Makefile linux-2.6.38.4/arch/x86/Make= file +--- linux-2.6.38.4/arch/x86/Makefile 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/Makefile 2011-04-17 15:57:32.000000000 -0400 @@ -195,3 +195,12 @@ define archhelp echo ' FDARGS=3D"..." arguments for the booted ker= nel' echo ' FDINITRD=3Dfile initrd for the booted kernel= ' @@ -17844,9 +17743,9 @@ diff -urNp linux-2.6.38.3/arch/x86/Makefile linux= -2.6.38.3/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.38.3/arch/x86/mm/extable.c linux-2.6.38.3/arch/x86/= mm/extable.c ---- linux-2.6.38.3/arch/x86/mm/extable.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/mm/extable.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/extable.c linux-2.6.38.4/arch/x86/= mm/extable.c +--- linux-2.6.38.4/arch/x86/mm/extable.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/mm/extable.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -1,14 +1,71 @@ #include #include @@ -17920,9 +17819,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/extable.c l= inux-2.6.38.3/arch/x86/mm/extab extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap =3D 1; -diff -urNp linux-2.6.38.3/arch/x86/mm/fault.c linux-2.6.38.3/arch/x86/mm= /fault.c ---- linux-2.6.38.3/arch/x86/mm/fault.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/arch/x86/mm/fault.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/arch/x86/mm/fault.c linux-2.6.38.4/arch/x86/mm= /fault.c +--- linux-2.6.38.4/arch/x86/mm/fault.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/arch/x86/mm/fault.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -12,10 +12,18 @@ #include /* kmmio_handler, ... */ #include /* perf_sw_event */ @@ -18592,9 +18491,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/fault.c lin= ux-2.6.38.3/arch/x86/mm/fault.c + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.38.3/arch/x86/mm/gup.c linux-2.6.38.3/arch/x86/mm/g= up.c ---- linux-2.6.38.3/arch/x86/mm/gup.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/mm/gup.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/gup.c linux-2.6.38.4/arch/x86/mm/g= up.c +--- linux-2.6.38.4/arch/x86/mm/gup.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/mm/gup.c 2011-04-17 15:57:32.000000000 -0400 @@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long=20 addr =3D start; len =3D (unsigned long) nr_pages << PAGE_SHIFT; @@ -18604,9 +18503,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/gup.c linux= -2.6.38.3/arch/x86/mm/gup.c (void __user *)start, len))) return 0; =20 -diff -urNp linux-2.6.38.3/arch/x86/mm/highmem_32.c linux-2.6.38.3/arch/x= 86/mm/highmem_32.c ---- linux-2.6.38.3/arch/x86/mm/highmem_32.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/mm/highmem_32.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/highmem_32.c linux-2.6.38.4/arch/x= 86/mm/highmem_32.c +--- linux-2.6.38.4/arch/x86/mm/highmem_32.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/mm/highmem_32.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page idx =3D type + KM_TYPE_NR*smp_processor_id(); vaddr =3D __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -18618,9 +18517,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/highmem_32.= c linux-2.6.38.3/arch/x86/mm/hi =20 return (void *)vaddr; } -diff -urNp linux-2.6.38.3/arch/x86/mm/hugetlbpage.c linux-2.6.38.3/arch/= x86/mm/hugetlbpage.c ---- linux-2.6.38.3/arch/x86/mm/hugetlbpage.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/arch/x86/mm/hugetlbpage.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/hugetlbpage.c linux-2.6.38.4/arch/= x86/mm/hugetlbpage.c +--- linux-2.6.38.4/arch/x86/mm/hugetlbpage.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/mm/hugetlbpage.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe struct hstate *h =3D hstate_file(file); struct mm_struct *mm =3D current->mm; @@ -18828,9 +18727,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/hugetlbpage= .c linux-2.6.38.3/arch/x86/mm/h return addr; } if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area) -diff -urNp linux-2.6.38.3/arch/x86/mm/init_32.c linux-2.6.38.3/arch/x86/= mm/init_32.c ---- linux-2.6.38.3/arch/x86/mm/init_32.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/mm/init_32.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/init_32.c linux-2.6.38.4/arch/x86/= mm/init_32.c +--- linux-2.6.38.4/arch/x86/mm/init_32.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/mm/init_32.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void) } =20 @@ -19105,9 +19004,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/init_32.c l= inux-2.6.38.3/arch/x86/mm/init_ set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-2.6.38.3/arch/x86/mm/init_64.c linux-2.6.38.3/arch/x86/= mm/init_64.c ---- linux-2.6.38.3/arch/x86/mm/init_64.c 2011-04-18 17:27:18.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/mm/init_64.c 2011-04-17 16:53:16.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/init_64.c linux-2.6.38.4/arch/x86/= mm/init_64.c +--- linux-2.6.38.4/arch/x86/mm/init_64.c 2011-04-18 17:27:18.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/mm/init_64.c 2011-04-17 16:53:16.000000000 -= 0400 @@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa * around without checking the pgd every time. */ @@ -19219,9 +19118,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/init_64.c l= inux-2.6.38.3/arch/x86/mm/init_ return "[vdso]"; if (vma =3D=3D &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.38.3/arch/x86/mm/init.c linux-2.6.38.3/arch/x86/mm/= init.c ---- linux-2.6.38.3/arch/x86/mm/init.c 2011-04-18 17:27:18.000000000 -040= 0 -+++ linux-2.6.38.3/arch/x86/mm/init.c 2011-04-17 16:53:16.000000000 -040= 0 +diff -urNp linux-2.6.38.4/arch/x86/mm/init.c linux-2.6.38.4/arch/x86/mm/= init.c +--- linux-2.6.38.4/arch/x86/mm/init.c 2011-04-18 17:27:18.000000000 -040= 0 ++++ linux-2.6.38.4/arch/x86/mm/init.c 2011-04-17 16:53:16.000000000 -040= 0 @@ -72,11 +72,7 @@ static void __init find_early_table_spac * cause a hotspot and fill up ZONE_DMA. The page tables * need roughly 0.5KB per GB. @@ -19340,9 +19239,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/init.c linu= x-2.6.38.3/arch/x86/mm/init.c free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.38.3/arch/x86/mm/iomap_32.c linux-2.6.38.3/arch/x86= /mm/iomap_32.c ---- linux-2.6.38.3/arch/x86/mm/iomap_32.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/mm/iomap_32.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/iomap_32.c linux-2.6.38.4/arch/x86= /mm/iomap_32.c +--- linux-2.6.38.4/arch/x86/mm/iomap_32.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/mm/iomap_32.c 2011-04-17 15:57:32.000000000 = -0400 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long type =3D kmap_atomic_idx_push(); idx =3D type + KM_TYPE_NR * smp_processor_id(); @@ -19355,9 +19254,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/iomap_32.c = linux-2.6.38.3/arch/x86/mm/ioma arch_flush_lazy_mmu_mode(); =20 return (void *)vaddr; -diff -urNp linux-2.6.38.3/arch/x86/mm/ioremap.c linux-2.6.38.3/arch/x86/= mm/ioremap.c ---- linux-2.6.38.3/arch/x86/mm/ioremap.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/mm/ioremap.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/ioremap.c linux-2.6.38.4/arch/x86/= mm/ioremap.c +--- linux-2.6.38.4/arch/x86/mm/ioremap.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/mm/ioremap.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re for (pfn =3D phys_addr >> PAGE_SHIFT; pfn <=3D last_pfn; pfn++) { int is_ram =3D page_is_ram(pfn); @@ -19386,9 +19285,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/ioremap.c l= inux-2.6.38.3/arch/x86/mm/iorem =20 /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.38.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38= .3/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.38.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38= .4/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:57:32= .000000000 -0400 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg * memory (e.g. tracked pages)? For now, we need this to avoid * invoking kmemcheck for PnP BIOS calls. @@ -19401,9 +19300,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/kmemcheck/k= memcheck.c linux-2.6.38.3/arch/ return false; =20 pte =3D kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.38.3/arch/x86/mm/mmap.c linux-2.6.38.3/arch/x86/mm/= mmap.c ---- linux-2.6.38.3/arch/x86/mm/mmap.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/arch/x86/mm/mmap.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/arch/x86/mm/mmap.c linux-2.6.38.4/arch/x86/mm/= mmap.c +--- linux-2.6.38.4/arch/x86/mm/mmap.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/arch/x86/mm/mmap.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -19485,9 +19384,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/mmap.c linu= x-2.6.38.3/arch/x86/mm/mmap.c mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; mm->unmap_area =3D arch_unmap_area_topdown; } -diff -urNp linux-2.6.38.3/arch/x86/mm/numa_32.c linux-2.6.38.3/arch/x86/= mm/numa_32.c ---- linux-2.6.38.3/arch/x86/mm/numa_32.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/mm/numa_32.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/numa_32.c linux-2.6.38.4/arch/x86/= mm/numa_32.c +--- linux-2.6.38.4/arch/x86/mm/numa_32.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/mm/numa_32.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -19496,9 +19395,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/numa_32.c l= inux-2.6.38.3/arch/x86/mm/numa_ extern unsigned long highend_pfn, highstart_pfn; =20 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.38.3/arch/x86/mm/pageattr.c linux-2.6.38.3/arch/x86= /mm/pageattr.c ---- linux-2.6.38.3/arch/x86/mm/pageattr.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/mm/pageattr.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr.c linux-2.6.38.4/arch/x86= /mm/pageattr.c +--- linux-2.6.38.4/arch/x86/mm/pageattr.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/mm/pageattr.c 2011-04-17 15:57:32.000000000 = -0400 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection */ #ifdef CONFIG_PCI_BIOS @@ -19583,9 +19482,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pageattr.c = linux-2.6.38.3/arch/x86/mm/page } =20 static int -diff -urNp linux-2.6.38.3/arch/x86/mm/pageattr-test.c linux-2.6.38.3/arc= h/x86/mm/pageattr-test.c ---- linux-2.6.38.3/arch/x86/mm/pageattr-test.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/arch/x86/mm/pageattr-test.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr-test.c linux-2.6.38.4/arc= h/x86/mm/pageattr-test.c +--- linux-2.6.38.4/arch/x86/mm/pageattr-test.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/arch/x86/mm/pageattr-test.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -36,7 +36,7 @@ enum { =20 static int pte_testbit(pte_t pte) @@ -19595,9 +19494,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pageattr-te= st.c linux-2.6.38.3/arch/x86/mm } =20 struct split_state { -diff -urNp linux-2.6.38.3/arch/x86/mm/pat.c linux-2.6.38.3/arch/x86/mm/p= at.c ---- linux-2.6.38.3/arch/x86/mm/pat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/mm/pat.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/pat.c linux-2.6.38.4/arch/x86/mm/p= at.c +--- linux-2.6.38.4/arch/x86/mm/pat.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/mm/pat.c 2011-04-17 15:57:32.000000000 -0400 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end) =20 if (!entry) { @@ -19645,9 +19544,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pat.c linux= -2.6.38.3/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.38.3/arch/x86/mm/pgtable_32.c linux-2.6.38.3/arch/x= 86/mm/pgtable_32.c ---- linux-2.6.38.3/arch/x86/mm/pgtable_32.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/mm/pgtable_32.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable_32.c linux-2.6.38.4/arch/x= 86/mm/pgtable_32.c +--- linux-2.6.38.4/arch/x86/mm/pgtable_32.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/mm/pgtable_32.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,=20 return; } @@ -19662,9 +19561,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pgtable_32.= c linux-2.6.38.3/arch/x86/mm/pg =20 /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.38.3/arch/x86/mm/pgtable.c linux-2.6.38.3/arch/x86/= mm/pgtable.c ---- linux-2.6.38.3/arch/x86/mm/pgtable.c 2011-04-18 17:27:13.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/mm/pgtable.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/= mm/pgtable.c +--- linux-2.6.38.4/arch/x86/mm/pgtable.c 2011-04-18 17:27:13.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/mm/pgtable.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -84,9 +84,58 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -19916,9 +19815,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pgtable.c l= inux-2.6.38.3/arch/x86/mm/pgtab pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.38.3/arch/x86/mm/setup_nx.c linux-2.6.38.3/arch/x86= /mm/setup_nx.c ---- linux-2.6.38.3/arch/x86/mm/setup_nx.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/mm/setup_nx.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/mm/setup_nx.c linux-2.6.38.4/arch/x86= /mm/setup_nx.c +--- linux-2.6.38.4/arch/x86/mm/setup_nx.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/mm/setup_nx.c 2011-04-17 15:57:32.000000000 = -0400 @@ -5,8 +5,10 @@ #include #include @@ -19948,18 +19847,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/setup_nx.c= linux-2.6.38.3/arch/x86/mm/setu __supported_pte_mask &=3D ~_PAGE_NX; } =20 -diff -urNp linux-2.6.38.3/arch/x86/mm/tlb.c linux-2.6.38.3/arch/x86/mm/t= lb.c ---- linux-2.6.38.3/arch/x86/mm/tlb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/mm/tlb.c 2011-04-17 15:57:32.000000000 -0400 -@@ -14,7 +14,7 @@ - #include -=20 - DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) -- =3D { &init_mm, 0, }; -+ =3D { &init_mm, 0 }; -=20 - /* - * Smarter SMP flushing macros. +diff -urNp linux-2.6.38.4/arch/x86/mm/tlb.c linux-2.6.38.4/arch/x86/mm/t= lb.c +--- linux-2.6.38.4/arch/x86/mm/tlb.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/mm/tlb.c 2011-04-23 12:47:27.000000000 -0400 @@ -65,7 +65,11 @@ void leave_mm(int cpu) BUG(); cpumask_clear_cpu(cpu, @@ -19972,9 +19862,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/tlb.c linux= -2.6.38.3/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); =20 -diff -urNp linux-2.6.38.3/arch/x86/oprofile/backtrace.c linux-2.6.38.3/a= rch/x86/oprofile/backtrace.c ---- linux-2.6.38.3/arch/x86/oprofile/backtrace.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/arch/x86/oprofile/backtrace.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/oprofile/backtrace.c linux-2.6.38.4/a= rch/x86/oprofile/backtrace.c +--- linux-2.6.38.4/arch/x86/oprofile/backtrace.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/arch/x86/oprofile/backtrace.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram struct stack_frame_ia32 *fp; =20 @@ -19993,9 +19883,9 @@ diff -urNp linux-2.6.38.3/arch/x86/oprofile/backt= race.c linux-2.6.38.3/arch/x86/ unsigned long stack =3D kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, -diff -urNp linux-2.6.38.3/arch/x86/oprofile/op_model_p4.c linux-2.6.38.3= /arch/x86/oprofile/op_model_p4.c ---- linux-2.6.38.3/arch/x86/oprofile/op_model_p4.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c linux-2.6.38.4= /arch/x86/oprofile/op_model_p4.c +--- linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -20005,9 +19895,9 @@ diff -urNp linux-2.6.38.3/arch/x86/oprofile/op_mo= del_p4.c linux-2.6.38.3/arch/x8 { #ifdef CONFIG_SMP return smp_num_siblings =3D=3D 2 ? 2 : 1; -diff -urNp linux-2.6.38.3/arch/x86/pci/ce4100.c linux-2.6.38.3/arch/x86/= pci/ce4100.c ---- linux-2.6.38.3/arch/x86/pci/ce4100.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/pci/ce4100.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/pci/ce4100.c linux-2.6.38.4/arch/x86/= pci/ce4100.c +--- linux-2.6.38.4/arch/x86/pci/ce4100.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/pci/ce4100.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned in return pci_direct_conf1.write(seg, bus, devfn, reg, len, value); } @@ -20017,9 +19907,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/ce4100.c l= inux-2.6.38.3/arch/x86/pci/ce41 .read =3D ce4100_conf_read, .write =3D ce4100_conf_write, }; -diff -urNp linux-2.6.38.3/arch/x86/pci/common.c linux-2.6.38.3/arch/x86/= pci/common.c ---- linux-2.6.38.3/arch/x86/pci/common.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/pci/common.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/pci/common.c linux-2.6.38.4/arch/x86/= pci/common.c +--- linux-2.6.38.4/arch/x86/pci/common.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/pci/common.c 2011-04-23 12:47:27.000000000 -= 0400 @@ -33,8 +33,8 @@ int noioapicreroute =3D 1; int pcibios_last_bus =3D -1; unsigned long pirq_table_addr; @@ -20031,18 +19921,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/common.c = linux-2.6.38.3/arch/x86/pci/comm =20 int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int de= vfn, int reg, int len, u32 *val) -@@ -423,7 +423,7 @@ static const struct dmi_system_id __devi - DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), - }, - }, -- {} -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} - }; -=20 - void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.38.3/arch/x86/pci/direct.c linux-2.6.38.3/arch/x86/= pci/direct.c ---- linux-2.6.38.3/arch/x86/pci/direct.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/pci/direct.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/pci/direct.c linux-2.6.38.4/arch/x86/= pci/direct.c +--- linux-2.6.38.4/arch/x86/pci/direct.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/pci/direct.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int=20 =20 #undef PCI_CONF1_ADDRESS @@ -20070,51 +19951,21 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/direct.c= linux-2.6.38.3/arch/x86/pci/dire { u32 x =3D 0; int year, devfn; -diff -urNp linux-2.6.38.3/arch/x86/pci/fixup.c linux-2.6.38.3/arch/x86/p= ci/fixup.c ---- linux-2.6.38.3/arch/x86/pci/fixup.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/arch/x86/pci/fixup.c 2011-04-17 15:57:32.000000000 -0= 400 -@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi - DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), - }, - }, -- {} -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - /* +diff -urNp linux-2.6.38.4/arch/x86/pci/fixup.c linux-2.6.38.4/arch/x86/p= ci/fixup.c +--- linux-2.6.38.4/arch/x86/pci/fixup.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/arch/x86/pci/fixup.c 2011-04-23 12:47:27.000000000 -0= 400 @@ -435,7 +435,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), }, }, - { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } ++ {} }; =20 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *de= v) -diff -urNp linux-2.6.38.3/arch/x86/pci/irq.c linux-2.6.38.3/arch/x86/pci= /irq.c ---- linux-2.6.38.3/arch/x86/pci/irq.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/arch/x86/pci/irq.c 2011-04-17 15:57:32.000000000 -040= 0 -@@ -542,7 +542,7 @@ static __init int intel_router_probe(str - static struct pci_device_id __initdata pirq_440gx[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2) }, -- { }, -+ { PCI_DEVICE(0, 0) } - }; -=20 - /* 440GX has a proprietary PIRQ router -- don't use it */ -@@ -1115,7 +1115,7 @@ static struct dmi_system_id __initdata p - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - void __init pcibios_irq_init(void) -diff -urNp linux-2.6.38.3/arch/x86/pci/mmconfig_32.c linux-2.6.38.3/arch= /x86/pci/mmconfig_32.c ---- linux-2.6.38.3/arch/x86/pci/mmconfig_32.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/pci/mmconfig_32.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_32.c linux-2.6.38.4/arch= /x86/pci/mmconfig_32.c +--- linux-2.6.38.4/arch/x86/pci/mmconfig_32.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/pci/mmconfig_32.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int=20 return 0; } @@ -20124,9 +19975,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/mmconfig_3= 2.c linux-2.6.38.3/arch/x86/pci .read =3D pci_mmcfg_read, .write =3D pci_mmcfg_write, }; -diff -urNp linux-2.6.38.3/arch/x86/pci/mmconfig_64.c linux-2.6.38.3/arch= /x86/pci/mmconfig_64.c ---- linux-2.6.38.3/arch/x86/pci/mmconfig_64.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/arch/x86/pci/mmconfig_64.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_64.c linux-2.6.38.4/arch= /x86/pci/mmconfig_64.c +--- linux-2.6.38.4/arch/x86/pci/mmconfig_64.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/arch/x86/pci/mmconfig_64.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int=20 return 0; } @@ -20136,9 +19987,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/mmconfig_6= 4.c linux-2.6.38.3/arch/x86/pci .read =3D pci_mmcfg_read, .write =3D pci_mmcfg_write, }; -diff -urNp linux-2.6.38.3/arch/x86/pci/numaq_32.c linux-2.6.38.3/arch/x8= 6/pci/numaq_32.c ---- linux-2.6.38.3/arch/x86/pci/numaq_32.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/x86/pci/numaq_32.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/x86/pci/numaq_32.c linux-2.6.38.4/arch/x8= 6/pci/numaq_32.c +--- linux-2.6.38.4/arch/x86/pci/numaq_32.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/x86/pci/numaq_32.c 2011-04-17 15:57:32.000000000= -0400 @@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i =20 #undef PCI_CONF1_MQ_ADDRESS @@ -20148,9 +19999,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/numaq_32.c= linux-2.6.38.3/arch/x86/pci/nu .read =3D pci_conf1_mq_read, .write =3D pci_conf1_mq_write }; -diff -urNp linux-2.6.38.3/arch/x86/pci/olpc.c linux-2.6.38.3/arch/x86/pc= i/olpc.c ---- linux-2.6.38.3/arch/x86/pci/olpc.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/arch/x86/pci/olpc.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/arch/x86/pci/olpc.c linux-2.6.38.4/arch/x86/pc= i/olpc.c +--- linux-2.6.38.4/arch/x86/pci/olpc.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/arch/x86/pci/olpc.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -20160,9 +20011,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/olpc.c lin= ux-2.6.38.3/arch/x86/pci/olpc.c .read =3D pci_olpc_read, .write =3D pci_olpc_write, }; -diff -urNp linux-2.6.38.3/arch/x86/pci/pcbios.c linux-2.6.38.3/arch/x86/= pci/pcbios.c ---- linux-2.6.38.3/arch/x86/pci/pcbios.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/arch/x86/pci/pcbios.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/arch/x86/pci/pcbios.c linux-2.6.38.4/arch/x86/= pci/pcbios.c +--- linux-2.6.38.4/arch/x86/pci/pcbios.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/arch/x86/pci/pcbios.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -79,50 +79,93 @@ union bios32 { static struct { unsigned long address; @@ -20485,9 +20336,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/pcbios.c l= inux-2.6.38.3/arch/x86/pci/pcbi return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.38.3/arch/x86/platform/efi/efi_32.c linux-2.6.38.3/= arch/x86/platform/efi/efi_32.c ---- linux-2.6.38.3/arch/x86/platform/efi/efi_32.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/platform/efi/efi_32.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_32.c linux-2.6.38.4/= arch/x86/platform/efi/efi_32.c +--- linux-2.6.38.4/arch/x86/platform/efi/efi_32.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/platform/efi/efi_32.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -38,70 +38,37 @@ */ =20 @@ -20568,9 +20419,9 @@ diff -urNp linux-2.6.38.3/arch/x86/platform/efi/e= fi_32.c linux-2.6.38.3/arch/x86 =20 /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.38.3/arch/x86/platform/efi/efi_stub_32.S linux-2.6.= 38.3/arch/x86/platform/efi/efi_stub_32.S ---- linux-2.6.38.3/arch/x86/platform/efi/efi_stub_32.S 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/arch/x86/platform/efi/efi_stub_32.S 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S linux-2.6.= 38.4/arch/x86/platform/efi/efi_stub_32.S +--- linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S 2011-04-17 15:57:= 32.000000000 -0400 @@ -6,6 +6,7 @@ */ =20 @@ -20669,9 +20520,9 @@ diff -urNp linux-2.6.38.3/arch/x86/platform/efi/e= fi_stub_32.S linux-2.6.38.3/arc saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.38.3/arch/x86/power/cpu.c linux-2.6.38.3/arch/x86/p= ower/cpu.c ---- linux-2.6.38.3/arch/x86/power/cpu.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/arch/x86/power/cpu.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/arch/x86/power/cpu.c linux-2.6.38.4/arch/x86/p= ower/cpu.c +--- linux-2.6.38.4/arch/x86/power/cpu.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/arch/x86/power/cpu.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -130,7 +130,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -20691,9 +20542,9 @@ diff -urNp linux-2.6.38.3/arch/x86/power/cpu.c li= nux-2.6.38.3/arch/x86/power/cpu =20 syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.38.3/arch/x86/vdso/Makefile linux-2.6.38.3/arch/x86= /vdso/Makefile ---- linux-2.6.38.3/arch/x86/vdso/Makefile 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/vdso/Makefile 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/vdso/Makefile linux-2.6.38.4/arch/x86= /vdso/Makefile +--- linux-2.6.38.4/arch/x86/vdso/Makefile 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/vdso/Makefile 2011-04-17 15:57:32.000000000 = -0400 @@ -123,7 +123,7 @@ quiet_cmd_vdso =3D VDSO $@ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' @@ -20703,9 +20554,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/Makefile = linux-2.6.38.3/arch/x86/vdso/Ma GCOV_PROFILE :=3D n =20 # -diff -urNp linux-2.6.38.3/arch/x86/vdso/vclock_gettime.c linux-2.6.38.3/= arch/x86/vdso/vclock_gettime.c ---- linux-2.6.38.3/arch/x86/vdso/vclock_gettime.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c linux-2.6.38.4/= arch/x86/vdso/vclock_gettime.c +--- linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -22,24 +22,48 @@ #include #include @@ -20804,9 +20655,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vclock_ge= ttime.c linux-2.6.38.3/arch/x86 } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.38.3/arch/x86/vdso/vdso32-setup.c linux-2.6.38.3/ar= ch/x86/vdso/vdso32-setup.c ---- linux-2.6.38.3/arch/x86/vdso/vdso32-setup.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/arch/x86/vdso/vdso32-setup.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c linux-2.6.38.4/ar= ch/x86/vdso/vdso32-setup.c +--- linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -25,6 +25,7 @@ #include #include @@ -20889,9 +20740,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vdso32-se= tup.c linux-2.6.38.3/arch/x86/v return &gate_vma; return NULL; } -diff -urNp linux-2.6.38.3/arch/x86/vdso/vdso.lds.S linux-2.6.38.3/arch/x= 86/vdso/vdso.lds.S ---- linux-2.6.38.3/arch/x86/vdso/vdso.lds.S 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/vdso/vdso.lds.S 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso.lds.S linux-2.6.38.4/arch/x= 86/vdso/vdso.lds.S +--- linux-2.6.38.4/arch/x86/vdso/vdso.lds.S 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/vdso/vdso.lds.S 2011-04-17 15:57:32.00000000= 0 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK =3D VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x =3D vdso_ ## x; #include "vextern.h" @@ -20902,9 +20753,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vdso.lds.= S linux-2.6.38.3/arch/x86/vdso/ +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.38.3/arch/x86/vdso/vextern.h linux-2.6.38.3/arch/x8= 6/vdso/vextern.h ---- linux-2.6.38.3/arch/x86/vdso/vextern.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/x86/vdso/vextern.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/x86/vdso/vextern.h linux-2.6.38.4/arch/x8= 6/vdso/vextern.h +--- linux-2.6.38.4/arch/x86/vdso/vextern.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/x86/vdso/vextern.h 2011-04-17 15:57:32.000000000= -0400 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. The main kernel later fills in the values. */ @@ -20912,9 +20763,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vextern.h= linux-2.6.38.3/arch/x86/vdso/v -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.38.3/arch/x86/vdso/vma.c linux-2.6.38.3/arch/x86/vd= so/vma.c ---- linux-2.6.38.3/arch/x86/vdso/vma.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/arch/x86/vdso/vma.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/arch/x86/vdso/vma.c linux-2.6.38.4/arch/x86/vd= so/vma.c +--- linux-2.6.38.4/arch/x86/vdso/vma.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/arch/x86/vdso/vma.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -20953,9 +20804,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vma.c lin= ux-2.6.38.3/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=3D", vdso_setup); -diff -urNp linux-2.6.38.3/arch/x86/xen/enlighten.c linux-2.6.38.3/arch/x= 86/xen/enlighten.c ---- linux-2.6.38.3/arch/x86/xen/enlighten.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/arch/x86/xen/enlighten.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/arch/x86/xen/enlighten.c linux-2.6.38.4/arch/x= 86/xen/enlighten.c +--- linux-2.6.38.4/arch/x86/xen/enlighten.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/arch/x86/xen/enlighten.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); =20 struct shared_info xen_dummy_shared_info; @@ -20998,9 +20849,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/enlighten.= c linux-2.6.38.3/arch/x86/xen/e xen_smp_init(); =20 #ifdef CONFIG_ACPI_NUMA -diff -urNp linux-2.6.38.3/arch/x86/xen/mmu.c linux-2.6.38.3/arch/x86/xen= /mmu.c ---- linux-2.6.38.3/arch/x86/xen/mmu.c 2011-04-18 17:27:16.000000000 -040= 0 -+++ linux-2.6.38.3/arch/x86/xen/mmu.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/arch/x86/xen/mmu.c linux-2.6.38.4/arch/x86/xen= /mmu.c +--- linux-2.6.38.4/arch/x86/xen/mmu.c 2011-04-18 17:27:16.000000000 -040= 0 ++++ linux-2.6.38.4/arch/x86/xen/mmu.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -1721,6 +1721,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -21021,9 +20872,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/mmu.c linu= x-2.6.38.3/arch/x86/xen/mmu.c set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); =20 -diff -urNp linux-2.6.38.3/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.3/= arch/x86/xen/pci-swiotlb-xen.c ---- linux-2.6.38.3/arch/x86/xen/pci-swiotlb-xen.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/arch/x86/xen/pci-swiotlb-xen.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.4/= arch/x86/xen/pci-swiotlb-xen.c +--- linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -10,7 +10,7 @@ =20 int xen_swiotlb __read_mostly; @@ -21033,9 +20884,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/pci-swiotl= b-xen.c linux-2.6.38.3/arch/x86 .mapping_error =3D xen_swiotlb_dma_mapping_error, .alloc_coherent =3D xen_swiotlb_alloc_coherent, .free_coherent =3D xen_swiotlb_free_coherent, -diff -urNp linux-2.6.38.3/arch/x86/xen/smp.c linux-2.6.38.3/arch/x86/xen= /smp.c ---- linux-2.6.38.3/arch/x86/xen/smp.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/arch/x86/xen/smp.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/arch/x86/xen/smp.c linux-2.6.38.4/arch/x86/xen= /smp.c +--- linux-2.6.38.4/arch/x86/xen/smp.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/arch/x86/xen/smp.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() !=3D 0); @@ -21080,9 +20931,33 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/smp.c lin= ux-2.6.38.3/arch/x86/xen/smp.c #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -diff -urNp linux-2.6.38.3/arch/x86/xen/xen-head.S linux-2.6.38.3/arch/x8= 6/xen/xen-head.S ---- linux-2.6.38.3/arch/x86/xen/xen-head.S 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/arch/x86/xen/xen-head.S 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/arch/x86/xen/xen-asm_32.S linux-2.6.38.4/arch/= x86/xen/xen-asm_32.S +--- linux-2.6.38.4/arch/x86/xen/xen-asm_32.S 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/arch/x86/xen/xen-asm_32.S 2011-04-22 19:11:04.0000000= 00 -0400 +@@ -83,14 +83,14 @@ ENTRY(xen_iret) + ESP_OFFSET=3D4 # bytes pushed onto stack +=20 + /* +- * Store vcpu_info pointer for easy access. Do it this way to +- * avoid having to reload %fs ++ * Store vcpu_info pointer for easy access. + */ + #ifdef CONFIG_SMP +- GET_THREAD_INFO(%eax) +- movl TI_cpu(%eax), %eax +- movl __per_cpu_offset(,%eax,4), %eax +- mov xen_vcpu(%eax), %eax ++ push %fs ++ mov $(__KERNEL_PERCPU), %eax ++ mov %eax, %fs ++ mov PER_CPU_VAR(xen_vcpu), %eax ++ pop %fs + #else + movl xen_vcpu, %eax + #endif +diff -urNp linux-2.6.38.4/arch/x86/xen/xen-head.S linux-2.6.38.4/arch/x8= 6/xen/xen-head.S +--- linux-2.6.38.4/arch/x86/xen/xen-head.S 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/arch/x86/xen/xen-head.S 2011-04-17 15:57:32.000000000= -0400 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -21101,9 +20976,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/xen-head.S= linux-2.6.38.3/arch/x86/xen/xe #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-2.6.38.3/arch/x86/xen/xen-ops.h linux-2.6.38.3/arch/x86= /xen/xen-ops.h ---- linux-2.6.38.3/arch/x86/xen/xen-ops.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/arch/x86/xen/xen-ops.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/arch/x86/xen/xen-ops.h linux-2.6.38.4/arch/x86= /xen/xen-ops.h +--- linux-2.6.38.4/arch/x86/xen/xen-ops.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/arch/x86/xen/xen-ops.h 2011-04-17 15:57:32.000000000 = -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -21113,9 +20988,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/xen-ops.h = linux-2.6.38.3/arch/x86/xen/xen struct trap_info; void xen_copy_trap_info(struct trap_info *traps); =20 -diff -urNp linux-2.6.38.3/block/blk-iopoll.c linux-2.6.38.3/block/blk-io= poll.c ---- linux-2.6.38.3/block/blk-iopoll.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/block/blk-iopoll.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/block/blk-iopoll.c linux-2.6.38.4/block/blk-io= poll.c +--- linux-2.6.38.4/block/blk-iopoll.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/block/blk-iopoll.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -21125,9 +21000,9 @@ diff -urNp linux-2.6.38.3/block/blk-iopoll.c linu= x-2.6.38.3/block/blk-iopoll.c { struct list_head *list =3D &__get_cpu_var(blk_cpu_iopoll); int rearm =3D 0, budget =3D blk_iopoll_budget; -diff -urNp linux-2.6.38.3/block/blk-map.c linux-2.6.38.3/block/blk-map.c ---- linux-2.6.38.3/block/blk-map.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/block/blk-map.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/block/blk-map.c linux-2.6.38.4/block/blk-map.c +--- linux-2.6.38.4/block/blk-map.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/block/blk-map.c 2011-04-17 15:57:32.000000000 -0400 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue if (!len || !kbuf) return -EINVAL; @@ -21137,9 +21012,9 @@ diff -urNp linux-2.6.38.3/block/blk-map.c linux-2= .6.38.3/block/blk-map.c if (do_copy) bio =3D bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.38.3/block/blk-softirq.c linux-2.6.38.3/block/blk-s= oftirq.c ---- linux-2.6.38.3/block/blk-softirq.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/block/blk-softirq.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/block/blk-softirq.c linux-2.6.38.4/block/blk-s= oftirq.c +--- linux-2.6.38.4/block/blk-softirq.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/block/blk-softirq.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,=20 * Softirq action handler - move entries to local list and loop over th= em * while passing them to the queue registered handler. @@ -21149,9 +21024,9 @@ diff -urNp linux-2.6.38.3/block/blk-softirq.c lin= ux-2.6.38.3/block/blk-softirq.c { struct list_head *cpu_list, local_list; =20 -diff -urNp linux-2.6.38.3/block/bsg.c linux-2.6.38.3/block/bsg.c ---- linux-2.6.38.3/block/bsg.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/block/bsg.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/block/bsg.c linux-2.6.38.4/block/bsg.c +--- linux-2.6.38.4/block/bsg.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/block/bsg.c 2011-04-17 15:57:32.000000000 -0400 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r struct sg_io_v4 *hdr, struct bsg_device *bd, fmode_t has_write_perm) @@ -21179,9 +21054,9 @@ diff -urNp linux-2.6.38.3/block/bsg.c linux-2.6.3= 8.3/block/bsg.c if (hdr->subprotocol =3D=3D BSG_SUB_PROTOCOL_SCSI_CMD) { if (blk_verify_command(rq->cmd, has_write_perm)) return -EPERM; -diff -urNp linux-2.6.38.3/block/scsi_ioctl.c linux-2.6.38.3/block/scsi_i= octl.c ---- linux-2.6.38.3/block/scsi_ioctl.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/block/scsi_ioctl.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/block/scsi_ioctl.c linux-2.6.38.4/block/scsi_i= octl.c +--- linux-2.6.38.4/block/scsi_ioctl.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/block/scsi_ioctl.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command); static int blk_fill_sghdr_rq(struct request_queue *q, struct request *r= q, struct sg_io_hdr *hdr, fmode_t mode) @@ -21233,21 +21108,9 @@ diff -urNp linux-2.6.38.3/block/scsi_ioctl.c lin= ux-2.6.38.3/block/scsi_ioctl.c if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; =20 -diff -urNp linux-2.6.38.3/crypto/lrw.c linux-2.6.38.3/crypto/lrw.c ---- linux-2.6.38.3/crypto/lrw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/crypto/lrw.c 2011-04-17 15:57:32.000000000 -0400 -@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par - struct priv *ctx =3D crypto_tfm_ctx(parent); - struct crypto_cipher *child =3D ctx->child; - int err, i; -- be128 tmp =3D { 0 }; -+ be128 tmp =3D { 0, 0 }; - int bsize =3D crypto_cipher_blocksize(child); -=20 - crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.38.3/Documentation/dontdiff linux-2.6.38.3/Document= ation/dontdiff ---- linux-2.6.38.3/Documentation/dontdiff 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/Documentation/dontdiff 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/Documentation/dontdiff linux-2.6.38.4/Document= ation/dontdiff +--- linux-2.6.38.4/Documentation/dontdiff 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/Documentation/dontdiff 2011-04-17 15:57:32.000000000 = -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -21373,9 +21236,9 @@ diff -urNp linux-2.6.38.3/Documentation/dontdiff = linux-2.6.38.3/Documentation/do wakeup.bin wakeup.elf wakeup.lds -diff -urNp linux-2.6.38.3/Documentation/filesystems/sysfs.txt linux-2.6.= 38.3/Documentation/filesystems/sysfs.txt ---- linux-2.6.38.3/Documentation/filesystems/sysfs.txt 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/Documentation/filesystems/sysfs.txt 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/Documentation/filesystems/sysfs.txt linux-2.6.= 38.4/Documentation/filesystems/sysfs.txt +--- linux-2.6.38.4/Documentation/filesystems/sysfs.txt 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/Documentation/filesystems/sysfs.txt 2011-04-17 15:57:= 32.000000000 -0400 @@ -123,8 +123,8 @@ set of sysfs operations for forwarding r show and store methods of the attribute owners.=20 =20 @@ -21387,9 +21250,9 @@ diff -urNp linux-2.6.38.3/Documentation/filesyste= ms/sysfs.txt linux-2.6.38.3/Doc }; =20 [ Subsystems should have already defined a struct kobj_type as a -diff -urNp linux-2.6.38.3/Documentation/kernel-parameters.txt linux-2.6.= 38.3/Documentation/kernel-parameters.txt ---- linux-2.6.38.3/Documentation/kernel-parameters.txt 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/Documentation/kernel-parameters.txt 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/Documentation/kernel-parameters.txt linux-2.6.= 38.4/Documentation/kernel-parameters.txt +--- linux-2.6.38.4/Documentation/kernel-parameters.txt 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/Documentation/kernel-parameters.txt 2011-04-17 15:57:= 32.000000000 -0400 @@ -1853,6 +1853,13 @@ bytes respectively. Such letter suffixes the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -21404,9 +21267,9 @@ diff -urNp linux-2.6.38.3/Documentation/kernel-pa= rameters.txt linux-2.6.38.3/Doc pcbit=3D [HW,ISDN] =20 pcd. [PARIDE] -diff -urNp linux-2.6.38.3/drivers/acpi/battery.c linux-2.6.38.3/drivers/= acpi/battery.c ---- linux-2.6.38.3/drivers/acpi/battery.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/acpi/battery.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/acpi/battery.c linux-2.6.38.4/drivers/= acpi/battery.c +--- linux-2.6.38.4/drivers/acpi/battery.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/acpi/battery.c 2011-04-17 15:57:32.000000000 = -0400 @@ -862,7 +862,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } =20 @@ -21416,21 +21279,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/battery.c= linux-2.6.38.3/drivers/acpi/bat mode_t mode; const char *name; } acpi_battery_file[] =3D { -diff -urNp linux-2.6.38.3/drivers/acpi/blacklist.c linux-2.6.38.3/driver= s/acpi/blacklist.c ---- linux-2.6.38.3/drivers/acpi/blacklist.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/acpi/blacklist.c 2011-04-17 15:57:32.00000000= 0 -0400 -@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b - {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, - "Incorrect _ADR", 1}, -=20 -- {""} -+ {"", "", 0, NULL, all_versions, NULL, 0} - }; -=20 - #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.38.3/drivers/acpi/dock.c linux-2.6.38.3/drivers/acp= i/dock.c ---- linux-2.6.38.3/drivers/acpi/dock.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/acpi/dock.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/acpi/dock.c linux-2.6.38.4/drivers/acp= i/dock.c +--- linux-2.6.38.4/drivers/acpi/dock.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/acpi/dock.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -21449,9 +21300,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/dock.c lin= ux-2.6.38.3/drivers/acpi/dock.c void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.38.3/drivers/acpi/ec_sys.c linux-2.6.38.3/drivers/a= cpi/ec_sys.c ---- linux-2.6.38.3/drivers/acpi/ec_sys.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/acpi/ec_sys.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/acpi/ec_sys.c linux-2.6.38.4/drivers/a= cpi/ec_sys.c +--- linux-2.6.38.4/drivers/acpi/ec_sys.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/acpi/ec_sys.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f return count; } @@ -21461,9 +21312,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/ec_sys.c l= inux-2.6.38.3/drivers/acpi/ec_s .owner =3D THIS_MODULE, .open =3D acpi_ec_open_io, .read =3D acpi_ec_read_io, -diff -urNp linux-2.6.38.3/drivers/acpi/power_meter.c linux-2.6.38.3/driv= ers/acpi/power_meter.c ---- linux-2.6.38.3/drivers/acpi/power_meter.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/acpi/power_meter.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/acpi/power_meter.c linux-2.6.38.4/driv= ers/acpi/power_meter.c +--- linux-2.6.38.4/drivers/acpi/power_meter.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/acpi/power_meter.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d return res; =20 @@ -21473,9 +21324,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/power_mete= r.c linux-2.6.38.3/drivers/acpi =20 mutex_lock(&resource->lock); resource->trip[attr->index - 7] =3D temp; -diff -urNp linux-2.6.38.3/drivers/acpi/proc.c linux-2.6.38.3/drivers/acp= i/proc.c ---- linux-2.6.38.3/drivers/acpi/proc.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/acpi/proc.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/acpi/proc.c linux-2.6.38.4/drivers/acp= i/proc.c +--- linux-2.6.38.4/drivers/acpi/proc.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/acpi/proc.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -21510,9 +21361,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/proc.c lin= ux-2.6.38.3/drivers/acpi/proc.c if (device_can_wakeup(&dev->dev)) { bool enable =3D !device_may_wakeup(&dev->dev); device_set_wakeup_enable(&dev->dev, enable); -diff -urNp linux-2.6.38.3/drivers/acpi/processor_driver.c linux-2.6.38.3= /drivers/acpi/processor_driver.c ---- linux-2.6.38.3/drivers/acpi/processor_driver.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/acpi/processor_driver.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/acpi/processor_driver.c linux-2.6.38.4= /drivers/acpi/processor_driver.c +--- linux-2.6.38.4/drivers/acpi/processor_driver.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/acpi/processor_driver.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add( return 0; #endif @@ -21522,21 +21373,21 @@ diff -urNp linux-2.6.38.3/drivers/acpi/processo= r_driver.c linux-2.6.38.3/drivers =20 /* * Buggy BIOS check -diff -urNp linux-2.6.38.3/drivers/acpi/processor_idle.c linux-2.6.38.3/d= rivers/acpi/processor_idle.c ---- linux-2.6.38.3/drivers/acpi/processor_idle.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/acpi/processor_idle.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/acpi/processor_idle.c linux-2.6.38.4/d= rivers/acpi/processor_idle.c +--- linux-2.6.38.4/drivers/acpi/processor_idle.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/acpi/processor_idle.c 2011-04-23 12:47:27.000= 000000 -0400 @@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, (void *)1}, - {}, -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL}, ++ {} }; =20 =20 -diff -urNp linux-2.6.38.3/drivers/ata/acard-ahci.c linux-2.6.38.3/driver= s/ata/acard-ahci.c ---- linux-2.6.38.3/drivers/ata/acard-ahci.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/ata/acard-ahci.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/acard-ahci.c linux-2.6.38.4/driver= s/ata/acard-ahci.c +--- linux-2.6.38.4/drivers/ata/acard-ahci.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/ata/acard-ahci.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -87,7 +87,7 @@ static struct scsi_host_template acard_a AHCI_SHT("acard-ahci"), }; @@ -21546,9 +21397,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/acard-ahci.= c linux-2.6.38.3/drivers/ata/ac .inherits =3D &ahci_ops, .qc_prep =3D acard_ahci_qc_prep, .qc_fill_rtf =3D acard_ahci_qc_fill_rtf, -diff -urNp linux-2.6.38.3/drivers/ata/ahci.c linux-2.6.38.3/drivers/ata/= ahci.c ---- linux-2.6.38.3/drivers/ata/ahci.c 2011-04-18 17:27:13.000000000 -040= 0 -+++ linux-2.6.38.3/drivers/ata/ahci.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/drivers/ata/ahci.c linux-2.6.38.4/drivers/ata/= ahci.c +--- linux-2.6.38.4/drivers/ata/ahci.c 2011-04-18 17:27:13.000000000 -040= 0 ++++ linux-2.6.38.4/drivers/ata/ahci.c 2011-04-23 12:47:27.000000000 -040= 0 @@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh AHCI_SHT("ahci"), }; @@ -21570,18 +21421,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/ahci.c lin= ux-2.6.38.3/drivers/ata/ahci.c .inherits =3D &ahci_ops, .softreset =3D ahci_sb600_softreset, .pmp_softreset =3D ahci_sb600_softreset, -@@ -394,7 +394,7 @@ static const struct pci_device_id ahci_p - { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, -=20 -- { } /* terminate list */ -+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ - }; -=20 -=20 -diff -urNp linux-2.6.38.3/drivers/ata/ahci.h linux-2.6.38.3/drivers/ata/= ahci.h ---- linux-2.6.38.3/drivers/ata/ahci.h 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/drivers/ata/ahci.h 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/drivers/ata/ahci.h linux-2.6.38.4/drivers/ata/= ahci.h +--- linux-2.6.38.4/drivers/ata/ahci.h 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/drivers/ata/ahci.h 2011-04-17 15:57:32.000000000 -040= 0 @@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde .shost_attrs =3D ahci_shost_attrs, \ .sdev_attrs =3D ahci_sdev_attrs @@ -21591,9 +21433,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/ahci.h linu= x-2.6.38.3/drivers/ata/ahci.h =20 void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, u32 opts); -diff -urNp linux-2.6.38.3/drivers/ata/ata_generic.c linux-2.6.38.3/drive= rs/ata/ata_generic.c ---- linux-2.6.38.3/drivers/ata/ata_generic.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/ata_generic.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/ata_generic.c linux-2.6.38.4/drive= rs/ata/ata_generic.c +--- linux-2.6.38.4/drivers/ata/ata_generic.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/ata_generic.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -101,7 +101,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -21603,18 +21445,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/ata_generi= c.c linux-2.6.38.3/drivers/ata/a .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_unknown, .set_mode =3D generic_set_mode, -diff -urNp linux-2.6.38.3/drivers/ata/ata_piix.c linux-2.6.38.3/drivers/= ata/ata_piix.c ---- linux-2.6.38.3/drivers/ata/ata_piix.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/ata_piix.c 2011-04-17 15:57:32.000000000 = -0400 -@@ -309,7 +309,7 @@ static const struct pci_device_id piix_p - { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, - /* SATA Controller IDE (PBG) */ - { 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, -- { } /* terminate list */ -+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ - }; -=20 - static struct pci_driver piix_pci_driver =3D { +diff -urNp linux-2.6.38.4/drivers/ata/ata_piix.c linux-2.6.38.4/drivers/= ata/ata_piix.c +--- linux-2.6.38.4/drivers/ata/ata_piix.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/ata_piix.c 2011-04-23 12:47:28.000000000 = -0400 @@ -327,12 +327,12 @@ static struct scsi_host_template piix_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -21654,27 +21487,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/ata_piix.c= linux-2.6.38.3/drivers/ata/ata_ .inherits =3D &piix_sata_ops, .hardreset =3D sata_std_hardreset, .scr_read =3D piix_sidpr_scr_read, -@@ -638,7 +638,7 @@ static const struct ich_laptop ich_lapto - { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ - { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ - /* end marker */ -- { 0, } -+ { 0, 0, 0 } - }; -=20 - /** -@@ -1130,7 +1130,7 @@ static int piix_broken_suspend(void) - }, - }, -=20 -- { } /* terminate list */ -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } /* terminate list */ - }; - static const char *oemstrs[] =3D { - "Tecra M3,", -diff -urNp linux-2.6.38.3/drivers/ata/libahci.c linux-2.6.38.3/drivers/a= ta/libahci.c ---- linux-2.6.38.3/drivers/ata/libahci.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/ata/libahci.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/ata/libahci.c linux-2.6.38.4/drivers/a= ta/libahci.c +--- linux-2.6.38.4/drivers/ata/libahci.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/ata/libahci.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -137,7 +137,7 @@ struct device_attribute *ahci_sdev_attrs }; EXPORT_SYMBOL_GPL(ahci_sdev_attrs); @@ -21684,9 +21499,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libahci.c l= inux-2.6.38.3/drivers/ata/libah .inherits =3D &sata_pmp_port_ops, =20 .qc_defer =3D ahci_pmp_qc_defer, -diff -urNp linux-2.6.38.3/drivers/ata/libata-acpi.c linux-2.6.38.3/drive= rs/ata/libata-acpi.c ---- linux-2.6.38.3/drivers/ata/libata-acpi.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/libata-acpi.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/libata-acpi.c linux-2.6.38.4/drive= rs/ata/libata-acpi.c +--- linux-2.6.38.4/drivers/ata/libata-acpi.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/libata-acpi.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -21702,36 +21517,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libata-acp= i.c linux-2.6.38.3/drivers/ata/l .handler =3D ata_acpi_ap_notify_dock, .uevent =3D ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.38.3/drivers/ata/libata-core.c linux-2.6.38.3/drive= rs/ata/libata-core.c ---- linux-2.6.38.3/drivers/ata/libata-core.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/libata-core.c 2011-04-17 15:57:32.0000000= 00 -0400 -@@ -897,7 +897,7 @@ static const struct ata_xfer_ent { - { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, - { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, - { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 }, -- { -1, }, -+ { -1, 0, 0 } - }; -=20 - /** -@@ -2885,7 +2885,7 @@ static const struct ata_timing ata_timin - { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, - { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, -=20 -- { 0xFF } -+ { 0xFF, 0, 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - #define ENOUGH(v, unit) (((v)-1)/(unit)+1) -@@ -4141,7 +4141,7 @@ static const struct ata_blacklist_entry=20 - { "PIONEER DVD-RW DVR-212D", "1.28", ATA_HORKAGE_NOSETXFER }, -=20 - /* End Marker */ -- { } -+ { NULL, NULL, 0 } - }; -=20 - /** +diff -urNp linux-2.6.38.4/drivers/ata/libata-core.c linux-2.6.38.4/drive= rs/ata/libata-core.c +--- linux-2.6.38.4/drivers/ata/libata-core.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/libata-core.c 2011-04-23 12:47:28.0000000= 00 -0400 @@ -4746,7 +4746,7 @@ void ata_qc_free(struct ata_queued_cmd * struct ata_port *ap; unsigned int tag; @@ -21796,9 +21584,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libata-core= .c linux-2.6.38.3/drivers/ata/l .qc_prep =3D ata_noop_qc_prep, .qc_issue =3D ata_dummy_qc_issue, .error_handler =3D ata_dummy_error_handler, -diff -urNp linux-2.6.38.3/drivers/ata/libata-eh.c linux-2.6.38.3/drivers= /ata/libata-eh.c ---- linux-2.6.38.3/drivers/ata/libata-eh.c 2011-04-18 17:27:13.000000000= -0400 -+++ linux-2.6.38.3/drivers/ata/libata-eh.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/ata/libata-eh.c linux-2.6.38.4/drivers= /ata/libata-eh.c +--- linux-2.6.38.4/drivers/ata/libata-eh.c 2011-04-18 17:27:13.000000000= -0400 ++++ linux-2.6.38.4/drivers/ata/libata-eh.c 2011-04-17 15:57:32.000000000= -0400 @@ -3880,7 +3880,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ void ata_std_error_handler(struct ata_port *ap) @@ -21808,9 +21596,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libata-eh.c= linux-2.6.38.3/drivers/ata/lib ata_reset_fn_t hardreset =3D ops->hardreset; =20 /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.38.3/drivers/ata/libata-pmp.c linux-2.6.38.3/driver= s/ata/libata-pmp.c ---- linux-2.6.38.3/drivers/ata/libata-pmp.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/ata/libata-pmp.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/libata-pmp.c linux-2.6.38.4/driver= s/ata/libata-pmp.c +--- linux-2.6.38.4/drivers/ata/libata-pmp.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/ata/libata-pmp.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -21820,9 +21608,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libata-pmp.= c linux-2.6.38.3/drivers/ata/li int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link =3D &ap->link; struct ata_device *pmp_dev =3D pmp_link->device; -diff -urNp linux-2.6.38.3/drivers/ata/pata_acpi.c linux-2.6.38.3/drivers= /ata/pata_acpi.c ---- linux-2.6.38.3/drivers/ata/pata_acpi.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/ata/pata_acpi.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_acpi.c linux-2.6.38.4/drivers= /ata/pata_acpi.c +--- linux-2.6.38.4/drivers/ata/pata_acpi.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/ata/pata_acpi.c 2011-04-17 15:57:32.000000000= -0400 @@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -21832,9 +21620,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_acpi.c= linux-2.6.38.3/drivers/ata/pat .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D pacpi_qc_issue, .cable_detect =3D pacpi_cable_detect, -diff -urNp linux-2.6.38.3/drivers/ata/pata_ali.c linux-2.6.38.3/drivers/= ata/pata_ali.c ---- linux-2.6.38.3/drivers/ata/pata_ali.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_ali.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_ali.c linux-2.6.38.4/drivers/= ata/pata_ali.c +--- linux-2.6.38.4/drivers/ata/pata_ali.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_ali.c 2011-04-17 15:57:32.000000000 = -0400 @@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -21880,9 +21668,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ali.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &ali_dma_base_ops, .check_atapi_dma =3D ali_check_atapi_dma, .dev_config =3D ali_warn_atapi_dma, -diff -urNp linux-2.6.38.3/drivers/ata/pata_amd.c linux-2.6.38.3/drivers/= ata/pata_amd.c ---- linux-2.6.38.3/drivers/ata/pata_amd.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_amd.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_amd.c linux-2.6.38.4/drivers/= ata/pata_amd.c +--- linux-2.6.38.4/drivers/ata/pata_amd.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_amd.c 2011-04-17 15:57:32.000000000 = -0400 @@ -397,28 +397,28 @@ static const struct ata_port_operations=20 .prereset =3D amd_pre_reset, }; @@ -21932,9 +21720,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_amd.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &nv_base_port_ops, .set_piomode =3D nv133_set_piomode, .set_dmamode =3D nv133_set_dmamode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_artop.c linux-2.6.38.3/driver= s/ata/pata_artop.c ---- linux-2.6.38.3/drivers/ata/pata_artop.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_artop.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_artop.c linux-2.6.38.4/driver= s/ata/pata_artop.c +--- linux-2.6.38.4/drivers/ata/pata_artop.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_artop.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -312,7 +312,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -21953,9 +21741,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_artop.= c linux-2.6.38.3/drivers/ata/pa .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D artop6260_cable_detect, .set_piomode =3D artop6260_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_at32.c linux-2.6.38.3/drivers= /ata/pata_at32.c ---- linux-2.6.38.3/drivers/ata/pata_at32.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/ata/pata_at32.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_at32.c linux-2.6.38.4/drivers= /ata/pata_at32.c +--- linux-2.6.38.4/drivers/ata/pata_at32.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/ata/pata_at32.c 2011-04-17 15:57:32.000000000= -0400 @@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -21965,9 +21753,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_at32.c= linux-2.6.38.3/drivers/ata/pat .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D pata_at32_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_at91.c linux-2.6.38.3/drivers= /ata/pata_at91.c ---- linux-2.6.38.3/drivers/ata/pata_at91.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/ata/pata_at91.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_at91.c linux-2.6.38.4/drivers= /ata/pata_at91.c +--- linux-2.6.38.4/drivers/ata/pata_at91.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/ata/pata_at91.c 2011-04-17 15:57:32.000000000= -0400 @@ -196,7 +196,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -21977,9 +21765,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_at91.c= linux-2.6.38.3/drivers/ata/pat .inherits =3D &ata_sff_port_ops, =20 .sff_data_xfer =3D pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.38.3/drivers/ata/pata_atiixp.c linux-2.6.38.3/drive= rs/ata/pata_atiixp.c ---- linux-2.6.38.3/drivers/ata/pata_atiixp.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_atiixp.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_atiixp.c linux-2.6.38.4/drive= rs/ata/pata_atiixp.c +--- linux-2.6.38.4/drivers/ata/pata_atiixp.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_atiixp.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -21989,9 +21777,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_atiixp= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, =20 .qc_prep =3D ata_bmdma_dumb_qc_prep, -diff -urNp linux-2.6.38.3/drivers/ata/pata_atp867x.c linux-2.6.38.3/driv= ers/ata/pata_atp867x.c ---- linux-2.6.38.3/drivers/ata/pata_atp867x.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_atp867x.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_atp867x.c linux-2.6.38.4/driv= ers/ata/pata_atp867x.c +--- linux-2.6.38.4/drivers/ata/pata_atp867x.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_atp867x.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -275,7 +275,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -22001,9 +21789,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_atp867= x.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D atp867x_cable_detect, .set_piomode =3D atp867x_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_bf54x.c linux-2.6.38.3/driver= s/ata/pata_bf54x.c ---- linux-2.6.38.3/drivers/ata/pata_bf54x.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_bf54x.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_bf54x.c linux-2.6.38.4/driver= s/ata/pata_bf54x.c +--- linux-2.6.38.4/drivers/ata/pata_bf54x.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_bf54x.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -22013,9 +21801,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_bf54x.= c linux-2.6.38.3/drivers/ata/pa .inherits =3D &ata_bmdma_port_ops, =20 .set_piomode =3D bfin_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_cmd640.c linux-2.6.38.3/drive= rs/ata/pata_cmd640.c ---- linux-2.6.38.3/drivers/ata/pata_cmd640.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_cmd640.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd640.c linux-2.6.38.4/drive= rs/ata/pata_cmd640.c +--- linux-2.6.38.4/drivers/ata/pata_cmd640.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_cmd640.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_ ATA_PIO_SHT(DRV_NAME), }; @@ -22025,9 +21813,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cmd640= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_sff_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer =3D ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.38.3/drivers/ata/pata_cmd64x.c linux-2.6.38.3/drive= rs/ata/pata_cmd64x.c ---- linux-2.6.38.3/drivers/ata/pata_cmd64x.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_cmd64x.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd64x.c linux-2.6.38.4/drive= rs/ata/pata_cmd64x.c +--- linux-2.6.38.4/drivers/ata/pata_cmd64x.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_cmd64x.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -268,18 +268,18 @@ static const struct ata_port_operations=20 .set_dmamode =3D cmd64x_set_dmamode, }; @@ -22050,9 +21838,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cmd64x= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &cmd64x_base_ops, .bmdma_stop =3D cmd648_bmdma_stop, .cable_detect =3D cmd648_cable_detect, -diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5520.c linux-2.6.38.3/drive= rs/ata/pata_cs5520.c ---- linux-2.6.38.3/drivers/ata/pata_cs5520.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_cs5520.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5520.c linux-2.6.38.4/drive= rs/ata/pata_cs5520.c +--- linux-2.6.38.4/drivers/ata/pata_cs5520.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_cs5520.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -22062,9 +21850,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5520= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, .qc_prep =3D ata_bmdma_dumb_qc_prep, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5530.c linux-2.6.38.3/drive= rs/ata/pata_cs5530.c ---- linux-2.6.38.3/drivers/ata/pata_cs5530.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_cs5530.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5530.c linux-2.6.38.4/drive= rs/ata/pata_cs5530.c +--- linux-2.6.38.4/drivers/ata/pata_cs5530.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_cs5530.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -22074,9 +21862,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5530= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, =20 .qc_prep =3D ata_bmdma_dumb_qc_prep, -diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5535.c linux-2.6.38.3/drive= rs/ata/pata_cs5535.c ---- linux-2.6.38.3/drivers/ata/pata_cs5535.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_cs5535.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5535.c linux-2.6.38.4/drive= rs/ata/pata_cs5535.c +--- linux-2.6.38.4/drivers/ata/pata_cs5535.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_cs5535.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22086,9 +21874,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5535= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D cs5535_cable_detect, .set_piomode =3D cs5535_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5536.c linux-2.6.38.3/drive= rs/ata/pata_cs5536.c ---- linux-2.6.38.3/drivers/ata/pata_cs5536.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_cs5536.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5536.c linux-2.6.38.4/drive= rs/ata/pata_cs5536.c +--- linux-2.6.38.4/drivers/ata/pata_cs5536.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_cs5536.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22098,9 +21886,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5536= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma32_port_ops, .cable_detect =3D cs5536_cable_detect, .set_piomode =3D cs5536_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_cypress.c linux-2.6.38.3/driv= ers/ata/pata_cypress.c ---- linux-2.6.38.3/drivers/ata/pata_cypress.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_cypress.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_cypress.c linux-2.6.38.4/driv= ers/ata/pata_cypress.c +--- linux-2.6.38.4/drivers/ata/pata_cypress.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_cypress.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -22110,9 +21898,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cypres= s.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D cy82c693_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_efar.c linux-2.6.38.3/drivers= /ata/pata_efar.c ---- linux-2.6.38.3/drivers/ata/pata_efar.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/ata/pata_efar.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_efar.c linux-2.6.38.4/drivers= /ata/pata_efar.c +--- linux-2.6.38.4/drivers/ata/pata_efar.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/ata/pata_efar.c 2011-04-17 15:57:32.000000000= -0400 @@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -22122,9 +21910,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_efar.c= linux-2.6.38.3/drivers/ata/pat .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D efar_cable_detect, .set_piomode =3D efar_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt366.c linux-2.6.38.3/drive= rs/ata/pata_hpt366.c ---- linux-2.6.38.3/drivers/ata/pata_hpt366.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_hpt366.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt366.c linux-2.6.38.4/drive= rs/ata/pata_hpt366.c +--- linux-2.6.38.4/drivers/ata/pata_hpt366.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_hpt366.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -275,7 +275,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -22134,9 +21922,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt366= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D hpt36x_cable_detect, .mode_filter =3D hpt366_filter, -diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt37x.c linux-2.6.38.3/drive= rs/ata/pata_hpt37x.c ---- linux-2.6.38.3/drivers/ata/pata_hpt37x.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_hpt37x.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt37x.c linux-2.6.38.4/drive= rs/ata/pata_hpt37x.c +--- linux-2.6.38.4/drivers/ata/pata_hpt37x.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_hpt37x.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -587,7 +587,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -22182,9 +21970,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt37x= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &hpt372_port_ops, .cable_detect =3D hpt374_fn1_cable_detect, }; -diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt3x2n.c linux-2.6.38.3/driv= ers/ata/pata_hpt3x2n.c ---- linux-2.6.38.3/drivers/ata/pata_hpt3x2n.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_hpt3x2n.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c linux-2.6.38.4/driv= ers/ata/pata_hpt3x2n.c +--- linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -348,7 +348,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT302N/371N. */ @@ -22203,9 +21991,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt3x2= n.c linux-2.6.38.3/drivers/ata/ .inherits =3D &hpt3xxn_port_ops, .mode_filter =3D &hpt372n_filter, }; -diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt3x3.c linux-2.6.38.3/drive= rs/ata/pata_hpt3x3.c ---- linux-2.6.38.3/drivers/ata/pata_hpt3x3.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_hpt3x3.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x3.c linux-2.6.38.4/drive= rs/ata/pata_hpt3x3.c +--- linux-2.6.38.4/drivers/ata/pata_hpt3x3.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_hpt3x3.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22215,9 +22003,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt3x3= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D hpt3x3_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_icside.c linux-2.6.38.3/drive= rs/ata/pata_icside.c ---- linux-2.6.38.3/drivers/ata/pata_icside.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_icside.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_icside.c linux-2.6.38.4/drive= rs/ata/pata_icside.c +--- linux-2.6.38.4/drivers/ata/pata_icside.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_icside.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -320,7 +320,7 @@ static void pata_icside_postreset(struct } } @@ -22227,9 +22015,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_icside= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep =3D ata_noop_qc_prep, -diff -urNp linux-2.6.38.3/drivers/ata/pata_isapnp.c linux-2.6.38.3/drive= rs/ata/pata_isapnp.c ---- linux-2.6.38.3/drivers/ata/pata_isapnp.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_isapnp.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_isapnp.c linux-2.6.38.4/drive= rs/ata/pata_isapnp.c +--- linux-2.6.38.4/drivers/ata/pata_isapnp.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_isapnp.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -22245,9 +22033,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_isapnp= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.38.3/drivers/ata/pata_it8213.c linux-2.6.38.3/drive= rs/ata/pata_it8213.c ---- linux-2.6.38.3/drivers/ata/pata_it8213.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_it8213.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_it8213.c linux-2.6.38.4/drive= rs/ata/pata_it8213.c +--- linux-2.6.38.4/drivers/ata/pata_it8213.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_it8213.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -233,7 +233,7 @@ static struct scsi_host_template it8213_ }; =20 @@ -22257,9 +22045,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_it8213= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D it8213_cable_detect, .set_piomode =3D it8213_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_it821x.c linux-2.6.38.3/drive= rs/ata/pata_it821x.c ---- linux-2.6.38.3/drivers/ata/pata_it821x.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_it821x.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_it821x.c linux-2.6.38.4/drive= rs/ata/pata_it821x.c +--- linux-2.6.38.4/drivers/ata/pata_it821x.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_it821x.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -801,7 +801,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22287,9 +22075,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_it821x= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, =20 .check_atapi_dma=3D it821x_check_atapi_dma, -diff -urNp linux-2.6.38.3/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.3/dr= ivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.38.3/drivers/ata/pata_ixp4xx_cf.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.4/dr= ivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -22299,9 +22087,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ixp4xx= _cf.c linux-2.6.38.3/drivers/at .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ixp4xx_mmio_data_xfer, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.38.3/drivers/ata/pata_jmicron.c linux-2.6.38.3/driv= ers/ata/pata_jmicron.c ---- linux-2.6.38.3/drivers/ata/pata_jmicron.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_jmicron.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_jmicron.c linux-2.6.38.4/driv= ers/ata/pata_jmicron.c +--- linux-2.6.38.4/drivers/ata/pata_jmicron.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_jmicron.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -22311,9 +22099,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_jmicro= n.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .prereset =3D jmicron_pre_reset, }; -diff -urNp linux-2.6.38.3/drivers/ata/pata_legacy.c linux-2.6.38.3/drive= rs/ata/pata_legacy.c ---- linux-2.6.38.3/drivers/ata/pata_legacy.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_legacy.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_legacy.c linux-2.6.38.4/drive= rs/ata/pata_legacy.c +--- linux-2.6.38.4/drivers/ata/pata_legacy.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_legacy.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -116,7 +116,7 @@ struct legacy_probe { =20 struct legacy_controller { @@ -22425,9 +22213,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_legacy= .c linux-2.6.38.3/drivers/ata/p struct legacy_data *ld =3D &legacy_data[probe->slot]; struct ata_host *host =3D NULL; struct ata_port *ap; -diff -urNp linux-2.6.38.3/drivers/ata/pata_macio.c linux-2.6.38.3/driver= s/ata/pata_macio.c ---- linux-2.6.38.3/drivers/ata/pata_macio.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_macio.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_macio.c linux-2.6.38.4/driver= s/ata/pata_macio.c +--- linux-2.6.38.4/drivers/ata/pata_macio.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_macio.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma .slave_configure =3D pata_macio_slave_config, }; @@ -22439,9 +22227,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_macio.= c linux-2.6.38.3/drivers/ata/pa .freeze =3D pata_macio_freeze, .set_piomode =3D pata_macio_set_timings, .set_dmamode =3D pata_macio_set_timings, -diff -urNp linux-2.6.38.3/drivers/ata/pata_marvell.c linux-2.6.38.3/driv= ers/ata/pata_marvell.c ---- linux-2.6.38.3/drivers/ata/pata_marvell.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_marvell.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_marvell.c linux-2.6.38.4/driv= ers/ata/pata_marvell.c +--- linux-2.6.38.4/drivers/ata/pata_marvell.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_marvell.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -22451,9 +22239,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_marvel= l.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D marvell_cable_detect, .prereset =3D marvell_pre_reset, -diff -urNp linux-2.6.38.3/drivers/ata/pata_mpc52xx.c linux-2.6.38.3/driv= ers/ata/pata_mpc52xx.c ---- linux-2.6.38.3/drivers/ata/pata_mpc52xx.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_mpc52xx.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_mpc52xx.c linux-2.6.38.4/driv= ers/ata/pata_mpc52xx.c +--- linux-2.6.38.4/drivers/ata/pata_mpc52xx.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_mpc52xx.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -22463,9 +22251,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_mpc52x= x.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .sff_dev_select =3D mpc52xx_ata_dev_select, .set_piomode =3D mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_mpiix.c linux-2.6.38.3/driver= s/ata/pata_mpiix.c ---- linux-2.6.38.3/drivers/ata/pata_mpiix.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_mpiix.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_mpiix.c linux-2.6.38.4/driver= s/ata/pata_mpiix.c +--- linux-2.6.38.4/drivers/ata/pata_mpiix.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_mpiix.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -22475,9 +22263,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_mpiix.= c linux-2.6.38.3/drivers/ata/pa .inherits =3D &ata_sff_port_ops, .qc_issue =3D mpiix_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.38.3/drivers/ata/pata_netcell.c linux-2.6.38.3/driv= ers/ata/pata_netcell.c ---- linux-2.6.38.3/drivers/ata/pata_netcell.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_netcell.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_netcell.c linux-2.6.38.4/driv= ers/ata/pata_netcell.c +--- linux-2.6.38.4/drivers/ata/pata_netcell.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_netcell.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -22487,9 +22275,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_netcel= l.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_80wire, .read_id =3D netcell_read_id, -diff -urNp linux-2.6.38.3/drivers/ata/pata_ninja32.c linux-2.6.38.3/driv= ers/ata/pata_ninja32.c ---- linux-2.6.38.3/drivers/ata/pata_ninja32.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_ninja32.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_ninja32.c linux-2.6.38.4/driv= ers/ata/pata_ninja32.c +--- linux-2.6.38.4/drivers/ata/pata_ninja32.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_ninja32.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -22499,9 +22287,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ninja3= 2.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .sff_dev_select =3D ninja32_dev_select, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.38.3/drivers/ata/pata_ns87410.c linux-2.6.38.3/driv= ers/ata/pata_ns87410.c ---- linux-2.6.38.3/drivers/ata/pata_ns87410.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_ns87410.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87410.c linux-2.6.38.4/driv= ers/ata/pata_ns87410.c +--- linux-2.6.38.4/drivers/ata/pata_ns87410.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_ns87410.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -22511,9 +22299,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ns8741= 0.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_sff_port_ops, .qc_issue =3D ns87410_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.38.3/drivers/ata/pata_ns87415.c linux-2.6.38.3/driv= ers/ata/pata_ns87415.c ---- linux-2.6.38.3/drivers/ata/pata_ns87415.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_ns87415.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87415.c linux-2.6.38.4/driv= ers/ata/pata_ns87415.c +--- linux-2.6.38.4/drivers/ata/pata_ns87415.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_ns87415.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -22532,9 +22320,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ns8741= 5.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ns87415_pata_ops, .sff_tf_read =3D ns87560_tf_read, .sff_check_status =3D ns87560_check_status, -diff -urNp linux-2.6.38.3/drivers/ata/pata_octeon_cf.c linux-2.6.38.3/dr= ivers/ata/pata_octeon_cf.c ---- linux-2.6.38.3/drivers/ata/pata_octeon_cf.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_octeon_cf.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_octeon_cf.c linux-2.6.38.4/dr= ivers/ata/pata_octeon_cf.c +--- linux-2.6.38.4/drivers/ata/pata_octeon_cf.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_octeon_cf.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -22544,9 +22332,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_octeon= _cf.c linux-2.6.38.3/drivers/at .inherits =3D &ata_sff_port_ops, .check_atapi_dma =3D octeon_cf_check_atapi_dma, .qc_prep =3D ata_noop_qc_prep, -diff -urNp linux-2.6.38.3/drivers/ata/pata_oldpiix.c linux-2.6.38.3/driv= ers/ata/pata_oldpiix.c ---- linux-2.6.38.3/drivers/ata/pata_oldpiix.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_oldpiix.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_oldpiix.c linux-2.6.38.4/driv= ers/ata/pata_oldpiix.c +--- linux-2.6.38.4/drivers/ata/pata_oldpiix.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_oldpiix.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -22556,9 +22344,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_oldpii= x.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D oldpiix_qc_issue, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.38.3/drivers/ata/pata_opti.c linux-2.6.38.3/drivers= /ata/pata_opti.c ---- linux-2.6.38.3/drivers/ata/pata_opti.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/ata/pata_opti.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_opti.c linux-2.6.38.4/drivers= /ata/pata_opti.c +--- linux-2.6.38.4/drivers/ata/pata_opti.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/ata/pata_opti.c 2011-04-17 15:57:32.000000000= -0400 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -22568,9 +22356,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_opti.c= linux-2.6.38.3/drivers/ata/pat .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_piomode =3D opti_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_optidma.c linux-2.6.38.3/driv= ers/ata/pata_optidma.c ---- linux-2.6.38.3/drivers/ata/pata_optidma.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_optidma.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_optidma.c linux-2.6.38.4/driv= ers/ata/pata_optidma.c +--- linux-2.6.38.4/drivers/ata/pata_optidma.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_optidma.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -22589,9 +22377,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_optidm= a.c linux-2.6.38.3/drivers/ata/ .inherits =3D &optidma_port_ops, .set_piomode =3D optiplus_set_pio_mode, .set_dmamode =3D optiplus_set_dma_mode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_palmld.c linux-2.6.38.3/drive= rs/ata/pata_palmld.c ---- linux-2.6.38.3/drivers/ata/pata_palmld.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_palmld.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_palmld.c linux-2.6.38.4/drive= rs/ata/pata_palmld.c +--- linux-2.6.38.4/drivers/ata/pata_palmld.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_palmld.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -22601,9 +22389,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_palmld= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, .cable_detect =3D ata_cable_40wire, -diff -urNp linux-2.6.38.3/drivers/ata/pata_pcmcia.c linux-2.6.38.3/drive= rs/ata/pata_pcmcia.c ---- linux-2.6.38.3/drivers/ata/pata_pcmcia.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_pcmcia.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_pcmcia.c linux-2.6.38.4/drive= rs/ata/pata_pcmcia.c +--- linux-2.6.38.4/drivers/ata/pata_pcmcia.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_pcmcia.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -22630,9 +22418,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_pcmcia= .c linux-2.6.38.3/drivers/ata/p =20 /* Set up attributes in order to probe card and get resources */ pdev->config_flags |=3D CONF_ENABLE_IRQ | CONF_AUTO_SET_IO | -diff -urNp linux-2.6.38.3/drivers/ata/pata_pdc2027x.c linux-2.6.38.3/dri= vers/ata/pata_pdc2027x.c ---- linux-2.6.38.3/drivers/ata/pata_pdc2027x.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_pdc2027x.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc2027x.c linux-2.6.38.4/dri= vers/ata/pata_pdc2027x.c +--- linux-2.6.38.4/drivers/ata/pata_pdc2027x.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_pdc2027x.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -22650,9 +22438,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_pdc202= 7x.c linux-2.6.38.3/drivers/ata .inherits =3D &pdc2027x_pata100_ops, .mode_filter =3D pdc2027x_mode_filter, .set_piomode =3D pdc2027x_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.3= /drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.38.3/drivers/ata/pata_pdc202xx_old.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.4= /drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -22671,9 +22459,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_pdc202= xx_old.c linux-2.6.38.3/drivers .inherits =3D &pdc2024x_port_ops, =20 .check_atapi_dma =3D pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.38.3/drivers/ata/pata_piccolo.c linux-2.6.38.3/driv= ers/ata/pata_piccolo.c ---- linux-2.6.38.3/drivers/ata/pata_piccolo.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_piccolo.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_piccolo.c linux-2.6.38.4/driv= ers/ata/pata_piccolo.c +--- linux-2.6.38.4/drivers/ata/pata_piccolo.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_piccolo.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -22683,9 +22471,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_piccol= o.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_unknown, .set_piomode =3D tosh_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_platform.c linux-2.6.38.3/dri= vers/ata/pata_platform.c ---- linux-2.6.38.3/drivers/ata/pata_platform.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_platform.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_platform.c linux-2.6.38.4/dri= vers/ata/pata_platform.c +--- linux-2.6.38.4/drivers/ata/pata_platform.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_platform.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -22695,9 +22483,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_platfo= rm.c linux-2.6.38.3/drivers/ata .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, .cable_detect =3D ata_cable_unknown, -diff -urNp linux-2.6.38.3/drivers/ata/pata_pxa.c linux-2.6.38.3/drivers/= ata/pata_pxa.c ---- linux-2.6.38.3/drivers/ata/pata_pxa.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_pxa.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_pxa.c linux-2.6.38.4/drivers/= ata/pata_pxa.c +--- linux-2.6.38.4/drivers/ata/pata_pxa.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_pxa.c 2011-04-17 15:57:32.000000000 = -0400 @@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata ATA_BMDMA_SHT(DRV_NAME), }; @@ -22707,9 +22495,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_pxa.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_40wire, =20 -diff -urNp linux-2.6.38.3/drivers/ata/pata_qdi.c linux-2.6.38.3/drivers/= ata/pata_qdi.c ---- linux-2.6.38.3/drivers/ata/pata_qdi.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_qdi.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_qdi.c linux-2.6.38.4/drivers/= ata/pata_qdi.c +--- linux-2.6.38.4/drivers/ata/pata_qdi.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_qdi.c 2011-04-17 15:57:32.000000000 = -0400 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -22728,9 +22516,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_qdi.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &qdi6500_port_ops, .set_piomode =3D qdi6580_set_piomode, }; -diff -urNp linux-2.6.38.3/drivers/ata/pata_radisys.c linux-2.6.38.3/driv= ers/ata/pata_radisys.c ---- linux-2.6.38.3/drivers/ata/pata_radisys.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_radisys.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_radisys.c linux-2.6.38.4/driv= ers/ata/pata_radisys.c +--- linux-2.6.38.4/drivers/ata/pata_radisys.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_radisys.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -22740,9 +22528,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_radisy= s.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .qc_issue =3D radisys_qc_issue, .cable_detect =3D ata_cable_unknown, -diff -urNp linux-2.6.38.3/drivers/ata/pata_rb532_cf.c linux-2.6.38.3/dri= vers/ata/pata_rb532_cf.c ---- linux-2.6.38.3/drivers/ata/pata_rb532_cf.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_rb532_cf.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_rb532_cf.c linux-2.6.38.4/dri= vers/ata/pata_rb532_cf.c +--- linux-2.6.38.4/drivers/ata/pata_rb532_cf.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_rb532_cf.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -22752,9 +22540,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_rb532_= cf.c linux-2.6.38.3/drivers/ata .inherits =3D &ata_sff_port_ops, .sff_data_xfer =3D ata_sff_data_xfer32, }; -diff -urNp linux-2.6.38.3/drivers/ata/pata_rdc.c linux-2.6.38.3/drivers/= ata/pata_rdc.c ---- linux-2.6.38.3/drivers/ata/pata_rdc.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_rdc.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_rdc.c linux-2.6.38.4/drivers/= ata/pata_rdc.c +--- linux-2.6.38.4/drivers/ata/pata_rdc.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_rdc.c 2011-04-17 15:57:32.000000000 = -0400 @@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -22764,9 +22552,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_rdc.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &ata_bmdma32_port_ops, .cable_detect =3D rdc_pata_cable_detect, .set_piomode =3D rdc_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_rz1000.c linux-2.6.38.3/drive= rs/ata/pata_rz1000.c ---- linux-2.6.38.3/drivers/ata/pata_rz1000.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_rz1000.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_rz1000.c linux-2.6.38.4/drive= rs/ata/pata_rz1000.c +--- linux-2.6.38.4/drivers/ata/pata_rz1000.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_rz1000.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -22776,9 +22564,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_rz1000= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_sff_port_ops, .cable_detect =3D ata_cable_40wire, .set_mode =3D rz1000_set_mode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_samsung_cf.c linux-2.6.38.3/d= rivers/ata/pata_samsung_cf.c ---- linux-2.6.38.3/drivers/ata/pata_samsung_cf.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_samsung_cf.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_samsung_cf.c linux-2.6.38.4/d= rivers/ata/pata_samsung_cf.c +--- linux-2.6.38.4/drivers/ata/pata_samsung_cf.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_samsung_cf.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3 ATA_PIO_SHT(DRV_NAME), }; @@ -22797,9 +22585,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_samsun= g_cf.c linux-2.6.38.3/drivers/a .inherits =3D &ata_sff_port_ops, .set_piomode =3D pata_s3c_set_piomode, }; -diff -urNp linux-2.6.38.3/drivers/ata/pata_sc1200.c linux-2.6.38.3/drive= rs/ata/pata_sc1200.c ---- linux-2.6.38.3/drivers/ata/pata_sc1200.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_sc1200.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_sc1200.c linux-2.6.38.4/drive= rs/ata/pata_sc1200.c +--- linux-2.6.38.4/drivers/ata/pata_sc1200.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_sc1200.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, }; @@ -22809,9 +22597,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sc1200= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma_port_ops, .qc_prep =3D ata_bmdma_dumb_qc_prep, .qc_issue =3D sc1200_qc_issue, -diff -urNp linux-2.6.38.3/drivers/ata/pata_scc.c linux-2.6.38.3/drivers/= ata/pata_scc.c ---- linux-2.6.38.3/drivers/ata/pata_scc.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_scc.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_scc.c linux-2.6.38.4/drivers/= ata/pata_scc.c +--- linux-2.6.38.4/drivers/ata/pata_scc.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_scc.c 2011-04-17 15:57:32.000000000 = -0400 @@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22821,9 +22609,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_scc.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, =20 .set_piomode =3D scc_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_sch.c linux-2.6.38.3/drivers/= ata/pata_sch.c ---- linux-2.6.38.3/drivers/ata/pata_sch.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_sch.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_sch.c linux-2.6.38.4/drivers/= ata/pata_sch.c +--- linux-2.6.38.4/drivers/ata/pata_sch.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_sch.c 2011-04-17 15:57:32.000000000 = -0400 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22833,9 +22621,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sch.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &ata_bmdma_port_ops, .cable_detect =3D ata_cable_unknown, .set_piomode =3D sch_set_piomode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_serverworks.c linux-2.6.38.3/= drivers/ata/pata_serverworks.c ---- linux-2.6.38.3/drivers/ata/pata_serverworks.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_serverworks.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_serverworks.c linux-2.6.38.4/= drivers/ata/pata_serverworks.c +--- linux-2.6.38.4/drivers/ata/pata_serverworks.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_serverworks.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -300,7 +300,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -22854,9 +22642,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_server= works.c linux-2.6.38.3/drivers/ .inherits =3D &serverworks_osb4_port_ops, .mode_filter =3D serverworks_csb_filter, }; -diff -urNp linux-2.6.38.3/drivers/ata/pata_sil680.c linux-2.6.38.3/drive= rs/ata/pata_sil680.c ---- linux-2.6.38.3/drivers/ata/pata_sil680.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_sil680.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_sil680.c linux-2.6.38.4/drive= rs/ata/pata_sil680.c +--- linux-2.6.38.4/drivers/ata/pata_sil680.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_sil680.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -225,8 +225,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22867,9 +22655,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sil680= .c linux-2.6.38.3/drivers/ata/p .inherits =3D &ata_bmdma32_port_ops, .sff_exec_command =3D sil680_sff_exec_command, .sff_irq_check =3D sil680_sff_irq_check, -diff -urNp linux-2.6.38.3/drivers/ata/pata_sis.c linux-2.6.38.3/drivers/= ata/pata_sis.c ---- linux-2.6.38.3/drivers/ata/pata_sis.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_sis.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_sis.c linux-2.6.38.4/drivers/= ata/pata_sis.c +--- linux-2.6.38.4/drivers/ata/pata_sis.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_sis.c 2011-04-17 15:57:32.000000000 = -0400 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22925,9 +22713,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sis.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &sis_base_ops, .set_piomode =3D sis_old_set_piomode, .set_dmamode =3D sis_old_set_dmamode, -diff -urNp linux-2.6.38.3/drivers/ata/pata_sl82c105.c linux-2.6.38.3/dri= vers/ata/pata_sl82c105.c ---- linux-2.6.38.3/drivers/ata/pata_sl82c105.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_sl82c105.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_sl82c105.c linux-2.6.38.4/dri= vers/ata/pata_sl82c105.c +--- linux-2.6.38.4/drivers/ata/pata_sl82c105.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_sl82c105.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -22937,9 +22725,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sl82c1= 05.c linux-2.6.38.3/drivers/ata .inherits =3D &ata_bmdma_port_ops, .qc_defer =3D sl82c105_qc_defer, .bmdma_start =3D sl82c105_bmdma_start, -diff -urNp linux-2.6.38.3/drivers/ata/pata_triflex.c linux-2.6.38.3/driv= ers/ata/pata_triflex.c ---- linux-2.6.38.3/drivers/ata/pata_triflex.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/pata_triflex.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_triflex.c linux-2.6.38.4/driv= ers/ata/pata_triflex.c +--- linux-2.6.38.4/drivers/ata/pata_triflex.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/pata_triflex.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -22949,9 +22737,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_trifle= x.c linux-2.6.38.3/drivers/ata/ .inherits =3D &ata_bmdma_port_ops, .bmdma_start =3D triflex_bmdma_start, .bmdma_stop =3D triflex_bmdma_stop, -diff -urNp linux-2.6.38.3/drivers/ata/pata_via.c linux-2.6.38.3/drivers/= ata/pata_via.c ---- linux-2.6.38.3/drivers/ata/pata_via.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pata_via.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pata_via.c linux-2.6.38.4/drivers/= ata/pata_via.c +--- linux-2.6.38.4/drivers/ata/pata_via.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pata_via.c 2011-04-17 15:57:32.000000000 = -0400 @@ -441,7 +441,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22970,9 +22758,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_via.c = linux-2.6.38.3/drivers/ata/pata .inherits =3D &via_port_ops, .sff_data_xfer =3D ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.38.3/drivers/ata/pdc_adma.c linux-2.6.38.3/drivers/= ata/pdc_adma.c ---- linux-2.6.38.3/drivers/ata/pdc_adma.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/pdc_adma.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/pdc_adma.c linux-2.6.38.4/drivers/= ata/pdc_adma.c +--- linux-2.6.38.4/drivers/ata/pdc_adma.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/pdc_adma.c 2011-04-17 15:57:32.000000000 = -0400 @@ -146,7 +146,7 @@ static struct scsi_host_template adma_at .dma_boundary =3D ADMA_DMA_BOUNDARY, }; @@ -22982,9 +22770,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pdc_adma.c = linux-2.6.38.3/drivers/ata/pdc_ .inherits =3D &ata_sff_port_ops, =20 .lost_interrupt =3D ATA_OP_NULL, -diff -urNp linux-2.6.38.3/drivers/ata/sata_dwc_460ex.c linux-2.6.38.3/dr= ivers/ata/sata_dwc_460ex.c ---- linux-2.6.38.3/drivers/ata/sata_dwc_460ex.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/ata/sata_dwc_460ex.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c linux-2.6.38.4/dr= ivers/ata/sata_dwc_460ex.c +--- linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -22994,9 +22782,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_dwc_46= 0ex.c linux-2.6.38.3/drivers/at .inherits =3D &ata_sff_port_ops, =20 .error_handler =3D sata_dwc_error_handler, -diff -urNp linux-2.6.38.3/drivers/ata/sata_fsl.c linux-2.6.38.3/drivers/= ata/sata_fsl.c ---- linux-2.6.38.3/drivers/ata/sata_fsl.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/sata_fsl.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_fsl.c linux-2.6.38.4/drivers/= ata/sata_fsl.c +--- linux-2.6.38.4/drivers/ata/sata_fsl.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/sata_fsl.c 2011-04-17 15:57:32.000000000 = -0400 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -23006,9 +22794,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_fsl.c = linux-2.6.38.3/drivers/ata/sata .inherits =3D &sata_pmp_port_ops, =20 .qc_defer =3D ata_std_qc_defer, -diff -urNp linux-2.6.38.3/drivers/ata/sata_inic162x.c linux-2.6.38.3/dri= vers/ata/sata_inic162x.c ---- linux-2.6.38.3/drivers/ata/sata_inic162x.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/ata/sata_inic162x.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_inic162x.c linux-2.6.38.4/dri= vers/ata/sata_inic162x.c +--- linux-2.6.38.4/drivers/ata/sata_inic162x.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/ata/sata_inic162x.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -23018,9 +22806,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_inic16= 2x.c linux-2.6.38.3/drivers/ata .inherits =3D &sata_port_ops, =20 .check_atapi_dma =3D inic_check_atapi_dma, -diff -urNp linux-2.6.38.3/drivers/ata/sata_mv.c linux-2.6.38.3/drivers/a= ta/sata_mv.c ---- linux-2.6.38.3/drivers/ata/sata_mv.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/ata/sata_mv.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_mv.c linux-2.6.38.4/drivers/a= ta/sata_mv.c +--- linux-2.6.38.4/drivers/ata/sata_mv.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/ata/sata_mv.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht .dma_boundary =3D MV_DMA_BOUNDARY, }; @@ -23048,9 +22836,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_mv.c l= inux-2.6.38.3/drivers/ata/sata_ .inherits =3D &mv6_ops, .dev_config =3D ATA_OP_NULL, .qc_prep =3D mv_qc_prep_iie, -diff -urNp linux-2.6.38.3/drivers/ata/sata_nv.c linux-2.6.38.3/drivers/a= ta/sata_nv.c ---- linux-2.6.38.3/drivers/ata/sata_nv.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/ata/sata_nv.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_nv.c linux-2.6.38.4/drivers/a= ta/sata_nv.c +--- linux-2.6.38.4/drivers/ata/sata_nv.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/ata/sata_nv.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc * cases. Define nv_hardreset() which only kicks in for post-boot * probing and use it for all variants. @@ -23093,9 +22881,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_nv.c l= inux-2.6.38.3/drivers/ata/sata_ .inherits =3D &nv_generic_ops, =20 .qc_defer =3D ata_std_qc_defer, -diff -urNp linux-2.6.38.3/drivers/ata/sata_promise.c linux-2.6.38.3/driv= ers/ata/sata_promise.c ---- linux-2.6.38.3/drivers/ata/sata_promise.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/ata/sata_promise.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_promise.c linux-2.6.38.4/driv= ers/ata/sata_promise.c +--- linux-2.6.38.4/drivers/ata/sata_promise.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/ata/sata_promise.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -196,7 +196,7 @@ static const struct ata_port_operations=20 .error_handler =3D pdc_error_handler, }; @@ -23122,9 +22910,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_promis= e.c linux-2.6.38.3/drivers/ata/ .inherits =3D &pdc_common_ops, .cable_detect =3D pdc_pata_cable_detect, .freeze =3D pdc_freeze, -diff -urNp linux-2.6.38.3/drivers/ata/sata_qstor.c linux-2.6.38.3/driver= s/ata/sata_qstor.c ---- linux-2.6.38.3/drivers/ata/sata_qstor.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/ata/sata_qstor.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_qstor.c linux-2.6.38.4/driver= s/ata/sata_qstor.c +--- linux-2.6.38.4/drivers/ata/sata_qstor.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/ata/sata_qstor.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary =3D QS_DMA_BOUNDARY, }; @@ -23134,9 +22922,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_qstor.= c linux-2.6.38.3/drivers/ata/sa .inherits =3D &ata_sff_port_ops, =20 .check_atapi_dma =3D qs_check_atapi_dma, -diff -urNp linux-2.6.38.3/drivers/ata/sata_sil24.c linux-2.6.38.3/driver= s/ata/sata_sil24.c ---- linux-2.6.38.3/drivers/ata/sata_sil24.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/ata/sata_sil24.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_sil24.c linux-2.6.38.4/driver= s/ata/sata_sil24.c +--- linux-2.6.38.4/drivers/ata/sata_sil24.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/ata/sata_sil24.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s .dma_boundary =3D ATA_DMA_BOUNDARY, }; @@ -23146,9 +22934,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_sil24.= c linux-2.6.38.3/drivers/ata/sa .inherits =3D &sata_pmp_port_ops, =20 .qc_defer =3D sil24_qc_defer, -diff -urNp linux-2.6.38.3/drivers/ata/sata_sil.c linux-2.6.38.3/drivers/= ata/sata_sil.c ---- linux-2.6.38.3/drivers/ata/sata_sil.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/sata_sil.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_sil.c linux-2.6.38.4/drivers/= ata/sata_sil.c +--- linux-2.6.38.4/drivers/ata/sata_sil.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/sata_sil.c 2011-04-17 15:57:32.000000000 = -0400 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize =3D ATA_MAX_PRD }; @@ -23158,9 +22946,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_sil.c = linux-2.6.38.3/drivers/ata/sata .inherits =3D &ata_bmdma32_port_ops, .dev_config =3D sil_dev_config, .set_mode =3D sil_set_mode, -diff -urNp linux-2.6.38.3/drivers/ata/sata_sis.c linux-2.6.38.3/drivers/= ata/sata_sis.c ---- linux-2.6.38.3/drivers/ata/sata_sis.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/sata_sis.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_sis.c linux-2.6.38.4/drivers/= ata/sata_sis.c +--- linux-2.6.38.4/drivers/ata/sata_sis.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/sata_sis.c 2011-04-17 15:57:32.000000000 = -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -23170,9 +22958,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_sis.c = linux-2.6.38.3/drivers/ata/sata .inherits =3D &ata_bmdma_port_ops, .scr_read =3D sis_scr_read, .scr_write =3D sis_scr_write, -diff -urNp linux-2.6.38.3/drivers/ata/sata_svw.c linux-2.6.38.3/drivers/= ata/sata_svw.c ---- linux-2.6.38.3/drivers/ata/sata_svw.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/sata_svw.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_svw.c linux-2.6.38.4/drivers/= ata/sata_svw.c +--- linux-2.6.38.4/drivers/ata/sata_svw.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/sata_svw.c 2011-04-17 15:57:32.000000000 = -0400 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; =20 @@ -23182,9 +22970,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_svw.c = linux-2.6.38.3/drivers/ata/sata .inherits =3D &ata_bmdma_port_ops, .sff_tf_load =3D k2_sata_tf_load, .sff_tf_read =3D k2_sata_tf_read, -diff -urNp linux-2.6.38.3/drivers/ata/sata_sx4.c linux-2.6.38.3/drivers/= ata/sata_sx4.c ---- linux-2.6.38.3/drivers/ata/sata_sx4.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/sata_sx4.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_sx4.c linux-2.6.38.4/drivers/= ata/sata_sx4.c +--- linux-2.6.38.4/drivers/ata/sata_sx4.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/sata_sx4.c 2011-04-17 15:57:32.000000000 = -0400 @@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat }; =20 @@ -23194,9 +22982,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_sx4.c = linux-2.6.38.3/drivers/ata/sata .inherits =3D &ata_sff_port_ops, =20 .check_atapi_dma =3D pdc_check_atapi_dma, -diff -urNp linux-2.6.38.3/drivers/ata/sata_uli.c linux-2.6.38.3/drivers/= ata/sata_uli.c ---- linux-2.6.38.3/drivers/ata/sata_uli.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/sata_uli.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_uli.c linux-2.6.38.4/drivers/= ata/sata_uli.c +--- linux-2.6.38.4/drivers/ata/sata_uli.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/sata_uli.c 2011-04-17 15:57:32.000000000 = -0400 @@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -23206,9 +22994,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_uli.c = linux-2.6.38.3/drivers/ata/sata .inherits =3D &ata_bmdma_port_ops, .scr_read =3D uli_scr_read, .scr_write =3D uli_scr_write, -diff -urNp linux-2.6.38.3/drivers/ata/sata_via.c linux-2.6.38.3/drivers/= ata/sata_via.c ---- linux-2.6.38.3/drivers/ata/sata_via.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/sata_via.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_via.c linux-2.6.38.4/drivers/= ata/sata_via.c +--- linux-2.6.38.4/drivers/ata/sata_via.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/sata_via.c 2011-04-17 15:57:32.000000000 = -0400 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -23247,9 +23035,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_via.c = linux-2.6.38.3/drivers/ata/sata .inherits =3D &svia_base_ops, .hardreset =3D sata_std_hardreset, .scr_read =3D vt8251_scr_read, -diff -urNp linux-2.6.38.3/drivers/ata/sata_vsc.c linux-2.6.38.3/drivers/= ata/sata_vsc.c ---- linux-2.6.38.3/drivers/ata/sata_vsc.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/ata/sata_vsc.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/ata/sata_vsc.c linux-2.6.38.4/drivers/= ata/sata_vsc.c +--- linux-2.6.38.4/drivers/ata/sata_vsc.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/ata/sata_vsc.c 2011-04-17 15:57:32.000000000 = -0400 @@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat }; =20 @@ -23259,9 +23047,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_vsc.c = linux-2.6.38.3/drivers/ata/sata .inherits =3D &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.38.3/drivers/atm/adummy.c linux-2.6.38.3/drivers/at= m/adummy.c ---- linux-2.6.38.3/drivers/atm/adummy.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/drivers/atm/adummy.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/drivers/atm/adummy.c linux-2.6.38.4/drivers/at= m/adummy.c +--- linux-2.6.38.4/drivers/atm/adummy.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/drivers/atm/adummy.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct=20 vcc->pop(vcc, skb); else @@ -23271,9 +23059,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/adummy.c li= nux-2.6.38.3/drivers/atm/adummy =20 return 0; } -diff -urNp linux-2.6.38.3/drivers/atm/ambassador.c linux-2.6.38.3/driver= s/atm/ambassador.c ---- linux-2.6.38.3/drivers/atm/ambassador.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/atm/ambassador.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/atm/ambassador.c linux-2.6.38.4/driver= s/atm/ambassador.c +--- linux-2.6.38.4/drivers/atm/ambassador.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/atm/ambassador.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,=20 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); =20 @@ -23310,9 +23098,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/ambassador.= c linux-2.6.38.3/drivers/atm/am return -ENOMEM; // ? } =20 -diff -urNp linux-2.6.38.3/drivers/atm/atmtcp.c linux-2.6.38.3/drivers/at= m/atmtcp.c ---- linux-2.6.38.3/drivers/atm/atmtcp.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/drivers/atm/atmtcp.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/drivers/atm/atmtcp.c linux-2.6.38.4/drivers/at= m/atmtcp.c +--- linux-2.6.38.4/drivers/atm/atmtcp.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/drivers/atm/atmtcp.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc=20 if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -23362,9 +23150,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/atmtcp.c li= nux-2.6.38.3/drivers/atm/atmtcp done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.38.3/drivers/atm/eni.c linux-2.6.38.3/drivers/atm/e= ni.c ---- linux-2.6.38.3/drivers/atm/eni.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/atm/eni.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/atm/eni.c linux-2.6.38.4/drivers/atm/e= ni.c +--- linux-2.6.38.4/drivers/atm/eni.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/atm/eni.c 2011-04-17 15:57:32.000000000 -0400 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -23410,9 +23198,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/eni.c linux= -2.6.38.3/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.38.3/drivers/atm/firestream.c linux-2.6.38.3/driver= s/atm/firestream.c ---- linux-2.6.38.3/drivers/atm/firestream.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/atm/firestream.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/atm/firestream.c linux-2.6.38.4/driver= s/atm/firestream.c +--- linux-2.6.38.4/drivers/atm/firestream.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/atm/firestream.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct } } @@ -23446,9 +23234,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/firestream.= c linux-2.6.38.3/drivers/atm/fi break; default: /* Hmm. Haven't written the code to handle the others yet...= -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n= ",=20 -diff -urNp linux-2.6.38.3/drivers/atm/fore200e.c linux-2.6.38.3/drivers/= atm/fore200e.c ---- linux-2.6.38.3/drivers/atm/fore200e.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/atm/fore200e.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/atm/fore200e.c linux-2.6.38.4/drivers/= atm/fore200e.c +--- linux-2.6.38.4/drivers/atm/fore200e.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/atm/fore200e.c 2011-04-17 15:57:32.000000000 = -0400 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -23505,9 +23293,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/fore200e.c = linux-2.6.38.3/drivers/atm/fore =20 fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - hear= tbeat is %08x\n", -diff -urNp linux-2.6.38.3/drivers/atm/he.c linux-2.6.38.3/drivers/atm/he= .c ---- linux-2.6.38.3/drivers/atm/he.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/atm/he.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/atm/he.c linux-2.6.38.4/drivers/atm/he= .c +--- linux-2.6.38.4/drivers/atm/he.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/atm/he.c 2011-04-17 15:57:32.000000000 -0400 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i =20 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -23589,9 +23377,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/he.c linux-= 2.6.38.3/drivers/atm/he.c =20 return 0; } -diff -urNp linux-2.6.38.3/drivers/atm/horizon.c linux-2.6.38.3/drivers/a= tm/horizon.c ---- linux-2.6.38.3/drivers/atm/horizon.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/atm/horizon.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/atm/horizon.c linux-2.6.38.4/drivers/a= tm/horizon.c +--- linux-2.6.38.4/drivers/atm/horizon.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/atm/horizon.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,=20 { struct atm_vcc * vcc =3D ATM_SKB(skb)->vcc; @@ -23610,9 +23398,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/horizon.c l= inux-2.6.38.3/drivers/atm/horiz =09 // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.38.3/drivers/atm/idt77252.c linux-2.6.38.3/drivers/= atm/idt77252.c ---- linux-2.6.38.3/drivers/atm/idt77252.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/atm/idt77252.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/atm/idt77252.c linux-2.6.38.4/drivers/= atm/idt77252.c +--- linux-2.6.38.4/drivers/atm/idt77252.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/atm/idt77252.c 2011-04-17 15:57:32.000000000 = -0400 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -23767,9 +23555,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/idt77252.c = linux-2.6.38.3/drivers/atm/idt7 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.38.3/drivers/atm/iphase.c linux-2.6.38.3/drivers/at= m/iphase.c ---- linux-2.6.38.3/drivers/atm/iphase.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/drivers/atm/iphase.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/drivers/atm/iphase.c linux-2.6.38.4/drivers/at= m/iphase.c +--- linux-2.6.38.4/drivers/atm/iphase.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/drivers/atm/iphase.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev) =20 status =3D (u_short) (buf_desc_ptr->desc_mode); =20 if (status & (RX_CER | RX_PTE | RX_OFL)) =20 @@ -23866,9 +23654,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/iphase.c li= nux-2.6.38.3/drivers/atm/iphase if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota =3D vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota =3D %d \n", (u32)vcc->tx_quota = ); -diff -urNp linux-2.6.38.3/drivers/atm/lanai.c linux-2.6.38.3/drivers/atm= /lanai.c ---- linux-2.6.38.3/drivers/atm/lanai.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/atm/lanai.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/atm/lanai.c linux-2.6.38.4/drivers/atm= /lanai.c +--- linux-2.6.38.4/drivers/atm/lanai.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/atm/lanai.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -23923,9 +23711,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/lanai.c lin= ux-2.6.38.3/drivers/atm/lanai.c lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr =3D &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.38.3/drivers/atm/nicstar.c linux-2.6.38.3/drivers/a= tm/nicstar.c ---- linux-2.6.38.3/drivers/atm/nicstar.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/atm/nicstar.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/atm/nicstar.c linux-2.6.38.4/drivers/a= tm/nicstar.c +--- linux-2.6.38.4/drivers/atm/nicstar.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/atm/nicstar.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc,=20 if ((vc =3D (vc_map *) vcc->dev_data) =3D=3D NULL) { printk("nicstar%d: vcc->dev_data =3D=3D NULL on ns_send().\n", @@ -24127,9 +23915,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/nicstar.c l= inux-2.6.38.3/drivers/atm/nicst } } =20 -diff -urNp linux-2.6.38.3/drivers/atm/solos-pci.c linux-2.6.38.3/drivers= /atm/solos-pci.c ---- linux-2.6.38.3/drivers/atm/solos-pci.c 2011-04-18 17:27:18.000000000= -0400 -+++ linux-2.6.38.3/drivers/atm/solos-pci.c 2011-04-17 16:53:16.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/atm/solos-pci.c linux-2.6.38.4/drivers= /atm/solos-pci.c +--- linux-2.6.38.4/drivers/atm/solos-pci.c 2011-04-18 17:27:18.000000000= -0400 ++++ linux-2.6.38.4/drivers/atm/solos-pci.c 2011-04-17 16:53:16.000000000= -0400 @@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -24148,9 +23936,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/solos-pci.c= linux-2.6.38.3/drivers/atm/sol solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.38.3/drivers/atm/suni.c linux-2.6.38.3/drivers/atm/= suni.c ---- linux-2.6.38.3/drivers/atm/suni.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/drivers/atm/suni.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/drivers/atm/suni.c linux-2.6.38.4/drivers/atm/= suni.c +--- linux-2.6.38.4/drivers/atm/suni.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/drivers/atm/suni.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock); =20 =20 @@ -24162,9 +23950,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/suni.c linu= x-2.6.38.3/drivers/atm/suni.c =20 =20 static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.38.3/drivers/atm/uPD98402.c linux-2.6.38.3/drivers/= atm/uPD98402.c ---- linux-2.6.38.3/drivers/atm/uPD98402.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/atm/uPD98402.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/atm/uPD98402.c linux-2.6.38.4/drivers/= atm/uPD98402.c +--- linux-2.6.38.4/drivers/atm/uPD98402.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/atm/uPD98402.c 2011-04-17 15:57:32.000000000 = -0400 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error =3D 0; @@ -24209,9 +23997,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/uPD98402.c = linux-2.6.38.3/drivers/atm/uPD9 return 0; } =20 -diff -urNp linux-2.6.38.3/drivers/atm/zatm.c linux-2.6.38.3/drivers/atm/= zatm.c ---- linux-2.6.38.3/drivers/atm/zatm.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/drivers/atm/zatm.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/drivers/atm/zatm.c linux-2.6.38.4/drivers/atm/= zatm.c +--- linux-2.6.38.4/drivers/atm/zatm.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/drivers/atm/zatm.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -24239,9 +24027,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/zatm.c linu= x-2.6.38.3/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } =20 -diff -urNp linux-2.6.38.3/drivers/block/cciss.c linux-2.6.38.3/drivers/b= lock/cciss.c ---- linux-2.6.38.3/drivers/block/cciss.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/block/cciss.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/block/cciss.c linux-2.6.38.4/drivers/b= lock/cciss.c +--- linux-2.6.38.4/drivers/block/cciss.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/block/cciss.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct int err; u32 cp; @@ -24251,9 +24039,9 @@ diff -urNp linux-2.6.38.3/drivers/block/cciss.c l= inux-2.6.38.3/drivers/block/cci err =3D 0; err |=3D copy_from_user(&arg64.LUN_info, &arg32->LUN_info, -diff -urNp linux-2.6.38.3/drivers/char/agp/frontend.c linux-2.6.38.3/dri= vers/char/agp/frontend.c ---- linux-2.6.38.3/drivers/char/agp/frontend.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/char/agp/frontend.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/char/agp/frontend.c linux-2.6.38.4/dri= vers/char/agp/frontend.c +--- linux-2.6.38.4/drivers/char/agp/frontend.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/char/agp/frontend.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -24263,21 +24051,70 @@ diff -urNp linux-2.6.38.3/drivers/char/agp/fron= tend.c linux-2.6.38.3/drivers/cha return -EFAULT; =20 client =3D agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.38.3/drivers/char/agp/intel-agp.c linux-2.6.38.3/dr= ivers/char/agp/intel-agp.c ---- linux-2.6.38.3/drivers/char/agp/intel-agp.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/char/agp/intel-agp.c 2011-04-17 15:57:32.0000= 00000 -0400 -@@ -903,7 +903,7 @@ static struct pci_device_id agp_intel_pc - ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB), - ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB), - ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB), -- { } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; +diff -urNp linux-2.6.38.4/drivers/char/agp/generic.c linux-2.6.38.4/driv= ers/char/agp/generic.c +--- linux-2.6.38.4/drivers/char/agp/generic.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/char/agp/generic.c 2011-04-22 19:37:16.000000= 000 -0400 +@@ -115,6 +115,9 @@ static struct agp_memory *agp_create_use + struct agp_memory *new; + unsigned long alloc_size =3D num_agp_pages*sizeof(struct page *); +=20 ++ if (INT_MAX/sizeof(struct page *) < num_agp_pages) ++ return NULL; ++ + new =3D kzalloc(sizeof(struct agp_memory), GFP_KERNEL); + if (new =3D=3D NULL) + return NULL; +@@ -234,11 +237,14 @@ struct agp_memory *agp_allocate_memory(s + int scratch_pages; + struct agp_memory *new; + size_t i; ++ int cur_memory; =20 - MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.38.3/drivers/char/briq_panel.c linux-2.6.38.3/drive= rs/char/briq_panel.c ---- linux-2.6.38.3/drivers/char/briq_panel.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/char/briq_panel.c 2011-04-18 19:47:43.0000000= 00 -0400 + if (!bridge) + return NULL; +=20 +- if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->= max_memory_agp) ++ cur_memory =3D atomic_read(&bridge->current_memory_agp); ++ if ((cur_memory + page_count > bridge->max_memory_agp) || ++ (cur_memory + page_count < page_count)) + return NULL; +=20 + if (type >=3D AGP_USER_TYPES) { +@@ -1089,8 +1095,8 @@ int agp_generic_insert_memory(struct agp + return -EINVAL; + } +=20 +- /* AK: could wrap */ +- if ((pg_start + mem->page_count) > num_entries) ++ if (((pg_start + mem->page_count) > num_entries) || ++ ((pg_start + mem->page_count) < pg_start)) + return -EINVAL; +=20 + j =3D pg_start; +@@ -1124,7 +1130,7 @@ int agp_generic_remove_memory(struct agp + { + size_t i; + struct agp_bridge_data *bridge; +- int mask_type; ++ int mask_type, num_entries; +=20 + bridge =3D mem->bridge; + if (!bridge) +@@ -1136,6 +1142,11 @@ int agp_generic_remove_memory(struct agp + if (type !=3D mem->type) + return -EINVAL; +=20 ++ num_entries =3D agp_num_entries(); ++ if (((pg_start + mem->page_count) > num_entries) || ++ ((pg_start + mem->page_count) < pg_start)) ++ return -EINVAL; ++ + mask_type =3D bridge->driver->agp_type_to_mask_type(bridge, type); + if (mask_type !=3D 0) { + /* The generic routines know nothing of memory types */ +diff -urNp linux-2.6.38.4/drivers/char/briq_panel.c linux-2.6.38.4/drive= rs/char/briq_panel.c +--- linux-2.6.38.4/drivers/char/briq_panel.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/char/briq_panel.c 2011-04-18 19:47:43.0000000= 00 -0400 @@ -9,6 +9,7 @@ #include #include @@ -24319,20 +24156,20 @@ diff -urNp linux-2.6.38.3/drivers/char/briq_pan= el.c linux-2.6.38.3/drivers/char/ =20 return len; } -diff -urNp linux-2.6.38.3/drivers/char/genrtc.c linux-2.6.38.3/drivers/c= har/genrtc.c ---- linux-2.6.38.3/drivers/char/genrtc.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/char/genrtc.c 2011-04-18 19:43:14.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/char/genrtc.c linux-2.6.38.4/drivers/c= har/genrtc.c +--- linux-2.6.38.4/drivers/char/genrtc.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/char/genrtc.c 2011-04-21 16:55:16.000000000 -= 0400 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi switch (cmd) { =20 case RTC_PLL_GET: -+ memset(&pll, 0, sizeof(pll); ++ memset(&pll, 0, sizeof(pll)); if (get_rtc_pll(&pll)) return -EINVAL; else -diff -urNp linux-2.6.38.3/drivers/char/hpet.c linux-2.6.38.3/drivers/cha= r/hpet.c ---- linux-2.6.38.3/drivers/char/hpet.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/char/hpet.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/char/hpet.c linux-2.6.38.4/drivers/cha= r/hpet.c +--- linux-2.6.38.4/drivers/char/hpet.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/char/hpet.c 2011-04-23 12:47:28.000000000 -04= 00 @@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di } =20 @@ -24342,18 +24179,9 @@ diff -urNp linux-2.6.38.3/drivers/char/hpet.c li= nux-2.6.38.3/drivers/char/hpet.c struct hpet_info *info) { struct hpet_timer __iomem *timer; -@@ -1043,7 +1043,7 @@ static struct acpi_driver hpet_acpi_driv - }, - }; -=20 --static struct miscdevice hpet_misc =3D { HPET_MINOR, "hpet", &hpet_fops= }; -+static struct miscdevice hpet_misc =3D { HPET_MINOR, "hpet", &hpet_fops= , {NULL, NULL}, NULL, NULL }; -=20 - static int __init hpet_init(void) - { -diff -urNp linux-2.6.38.3/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.= 38.3/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.38.3/drivers/char/ipmi/ipmi_msghandler.c 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/drivers/char/ipmi/ipmi_msghandler.c 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.= 38.4/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c 2011-04-17 15:57:= 32.000000000 -0400 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -24384,9 +24212,9 @@ diff -urNp linux-2.6.38.3/drivers/char/ipmi/ipmi_= msghandler.c linux-2.6.38.3/dri =20 intf->proc_dir =3D NULL; =20 -diff -urNp linux-2.6.38.3/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.= 3/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.38.3/drivers/char/ipmi/ipmi_si_intf.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.= 4/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -285,7 +285,7 @@ struct smi_info { unsigned char slave_addr; =20 @@ -24417,9 +24245,9 @@ diff -urNp linux-2.6.38.3/drivers/char/ipmi/ipmi_= si_intf.c linux-2.6.38.3/driver =20 new_smi->interrupt_disabled =3D 1; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.38.3/drivers/char/istallion.c linux-2.6.38.3/driver= s/char/istallion.c ---- linux-2.6.38.3/drivers/char/istallion.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/char/istallion.c 2011-04-18 19:42:25.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/char/istallion.c linux-2.6.38.4/driver= s/char/istallion.c +--- linux-2.6.38.4/drivers/char/istallion.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/char/istallion.c 2011-04-18 19:42:25.00000000= 0 -0400 @@ -186,7 +186,6 @@ static struct ktermios stli_deftermios=20 * re-used for each stats call. */ @@ -24436,9 +24264,9 @@ diff -urNp linux-2.6.38.3/drivers/char/istallion.= c linux-2.6.38.3/drivers/char/i =20 if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) return -EFAULT; -diff -urNp linux-2.6.38.3/drivers/char/Kconfig linux-2.6.38.3/drivers/ch= ar/Kconfig ---- linux-2.6.38.3/drivers/char/Kconfig 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/drivers/char/Kconfig 2011-04-18 19:19:48.000000000 -0= 400 +diff -urNp linux-2.6.38.4/drivers/char/Kconfig linux-2.6.38.4/drivers/ch= ar/Kconfig +--- linux-2.6.38.4/drivers/char/Kconfig 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/drivers/char/Kconfig 2011-04-18 19:19:48.000000000 -0= 400 @@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING =20 config DEVKMEM @@ -24457,9 +24285,9 @@ diff -urNp linux-2.6.38.3/drivers/char/Kconfig li= nux-2.6.38.3/drivers/char/Kconf default y =20 source "drivers/s390/char/Kconfig" -diff -urNp linux-2.6.38.3/drivers/char/mem.c linux-2.6.38.3/drivers/char= /mem.c ---- linux-2.6.38.3/drivers/char/mem.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/drivers/char/mem.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/drivers/char/mem.c linux-2.6.38.4/drivers/char= /mem.c +--- linux-2.6.38.4/drivers/char/mem.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/drivers/char/mem.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -18,6 +18,7 @@ #include #include @@ -24592,9 +24420,9 @@ diff -urNp linux-2.6.38.3/drivers/char/mem.c linu= x-2.6.38.3/drivers/char/mem.c }; =20 static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.38.3/drivers/char/nvram.c linux-2.6.38.3/drivers/ch= ar/nvram.c ---- linux-2.6.38.3/drivers/char/nvram.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/drivers/char/nvram.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/drivers/char/nvram.c linux-2.6.38.4/drivers/ch= ar/nvram.c +--- linux-2.6.38.4/drivers/char/nvram.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/drivers/char/nvram.c 2011-04-23 12:47:28.000000000 -0= 400 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f =20 spin_unlock_irq(&rtc_lock); @@ -24604,21 +24432,9 @@ diff -urNp linux-2.6.38.3/drivers/char/nvram.c l= inux-2.6.38.3/drivers/char/nvram return -EFAULT; =20 *ppos =3D i; -@@ -435,7 +435,10 @@ static const struct file_operations nvra - static struct miscdevice nvram_dev =3D { - NVRAM_MINOR, - "nvram", -- &nvram_fops -+ &nvram_fops, -+ {NULL, NULL}, -+ NULL, -+ NULL - }; -=20 - static int __init nvram_init(void) -diff -urNp linux-2.6.38.3/drivers/char/pcmcia/ipwireless/tty.c linux-2.6= .38.3/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.38.3/drivers/char/pcmcia/ipwireless/tty.c 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6= .38.4/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:57= :32.000000000 -0400 @@ -29,6 +29,7 @@ #include #include @@ -24741,9 +24557,9 @@ diff -urNp linux-2.6.38.3/drivers/char/pcmcia/ipw= ireless/tty.c linux-2.6.38.3/dr do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.38.3/drivers/char/random.c linux-2.6.38.3/drivers/c= har/random.c ---- linux-2.6.38.3/drivers/char/random.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/char/random.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/char/random.c linux-2.6.38.4/drivers/c= har/random.c +--- linux-2.6.38.4/drivers/char/random.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/char/random.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -254,8 +254,13 @@ /* * Configuration information @@ -24794,9 +24610,9 @@ diff -urNp linux-2.6.38.3/drivers/char/random.c l= inux-2.6.38.3/drivers/char/rand static int max_write_thresh =3D INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; =20 -diff -urNp linux-2.6.38.3/drivers/char/sonypi.c linux-2.6.38.3/drivers/c= har/sonypi.c ---- linux-2.6.38.3/drivers/char/sonypi.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/char/sonypi.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/char/sonypi.c linux-2.6.38.4/drivers/c= har/sonypi.c +--- linux-2.6.38.4/drivers/char/sonypi.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/char/sonypi.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -55,6 +55,7 @@ #include #include @@ -24835,9 +24651,9 @@ diff -urNp linux-2.6.38.3/drivers/char/sonypi.c l= inux-2.6.38.3/drivers/char/sony mutex_unlock(&sonypi_device.lock); =20 return 0; -diff -urNp linux-2.6.38.3/drivers/char/tpm/tpm_bios.c linux-2.6.38.3/dri= vers/char/tpm/tpm_bios.c ---- linux-2.6.38.3/drivers/char/tpm/tpm_bios.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/char/tpm/tpm_bios.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm_bios.c linux-2.6.38.4/dri= vers/char/tpm/tpm_bios.c +--- linux-2.6.38.4/drivers/char/tpm/tpm_bios.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/char/tpm/tpm_bios.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start event =3D addr; =20 @@ -24878,9 +24694,9 @@ diff -urNp linux-2.6.38.3/drivers/char/tpm/tpm_bi= os.c linux-2.6.38.3/drivers/cha =20 memcpy(log->bios_event_log, virt, len); =20 -diff -urNp linux-2.6.38.3/drivers/char/tpm/tpm.c linux-2.6.38.3/drivers/= char/tpm/tpm.c ---- linux-2.6.38.3/drivers/char/tpm/tpm.c 2011-04-18 17:27:18.000000000 = -0400 -+++ linux-2.6.38.3/drivers/char/tpm/tpm.c 2011-04-17 16:53:16.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm.c linux-2.6.38.4/drivers/= char/tpm/tpm.c +--- linux-2.6.38.4/drivers/char/tpm/tpm.c 2011-04-18 17:27:18.000000000 = -0400 ++++ linux-2.6.38.4/drivers/char/tpm/tpm.c 2011-04-17 16:53:16.000000000 = -0400 @@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c chip->vendor.req_complete_val) goto out_recv; @@ -24890,9 +24706,9 @@ diff -urNp linux-2.6.38.3/drivers/char/tpm/tpm.c = linux-2.6.38.3/drivers/char/tpm dev_err(chip->dev, "Operation Canceled\n"); rc =3D -ECANCELED; goto out; -diff -urNp linux-2.6.38.3/drivers/cpuidle/sysfs.c linux-2.6.38.3/drivers= /cpuidle/sysfs.c ---- linux-2.6.38.3/drivers/cpuidle/sysfs.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/cpuidle/sysfs.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/cpuidle/sysfs.c linux-2.6.38.4/drivers= /cpuidle/sysfs.c +--- linux-2.6.38.4/drivers/cpuidle/sysfs.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/cpuidle/sysfs.c 2011-04-17 15:57:32.000000000= -0400 @@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui .release =3D cpuidle_state_sysfs_release, }; @@ -24902,29 +24718,9 @@ diff -urNp linux-2.6.38.3/drivers/cpuidle/sysfs.= c linux-2.6.38.3/drivers/cpuidle { kobject_put(&device->kobjs[i]->kobj); wait_for_completion(&device->kobjs[i]->kobj_unregister); -diff -urNp linux-2.6.38.3/drivers/edac/edac_core.h linux-2.6.38.3/driver= s/edac/edac_core.h ---- linux-2.6.38.3/drivers/edac/edac_core.h 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/edac/edac_core.h 2011-04-17 15:57:32.00000000= 0 -0400 -@@ -88,11 +88,11 @@ extern int edac_debug_level; -=20 - #else /* !CONFIG_EDAC_DEBUG */ -=20 --#define debugf0( ... ) --#define debugf1( ... ) --#define debugf2( ... ) --#define debugf3( ... ) --#define debugf4( ... ) -+#define debugf0( ... ) do {} while (0) -+#define debugf1( ... ) do {} while (0) -+#define debugf2( ... ) do {} while (0) -+#define debugf3( ... ) do {} while (0) -+#define debugf4( ... ) do {} while (0) -=20 - #endif /* !CONFIG_EDAC_DEBUG */ -=20 -diff -urNp linux-2.6.38.3/drivers/edac/edac_mc_sysfs.c linux-2.6.38.3/dr= ivers/edac/edac_mc_sysfs.c ---- linux-2.6.38.3/drivers/edac/edac_mc_sysfs.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c linux-2.6.38.4/dr= ivers/edac/edac_mc_sysfs.c +--- linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -761,7 +761,7 @@ static void edac_inst_grp_release(struct } =20 @@ -24934,9 +24730,9 @@ diff -urNp linux-2.6.38.3/drivers/edac/edac_mc_sy= sfs.c linux-2.6.38.3/drivers/ed .show =3D inst_grp_show, .store =3D inst_grp_store }; -diff -urNp linux-2.6.38.3/drivers/firewire/core-cdev.c linux-2.6.38.3/dr= ivers/firewire/core-cdev.c ---- linux-2.6.38.3/drivers/firewire/core-cdev.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/firewire/core-cdev.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/firewire/core-cdev.c linux-2.6.38.4/dr= ivers/firewire/core-cdev.c +--- linux-2.6.38.4/drivers/firewire/core-cdev.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/firewire/core-cdev.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie int ret; =20 @@ -24947,9 +24743,9 @@ diff -urNp linux-2.6.38.3/drivers/firewire/core-c= dev.c linux-2.6.38.3/drivers/fi return -EINVAL; =20 r =3D kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-2.6.38.3/drivers/firmware/dmi_scan.c linux-2.6.38.3/dri= vers/firmware/dmi_scan.c ---- linux-2.6.38.3/drivers/firmware/dmi_scan.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/firmware/dmi_scan.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/firmware/dmi_scan.c linux-2.6.38.4/dri= vers/firmware/dmi_scan.c +--- linux-2.6.38.4/drivers/firmware/dmi_scan.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/firmware/dmi_scan.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void) } } @@ -24962,9 +24758,9 @@ diff -urNp linux-2.6.38.3/drivers/firmware/dmi_sc= an.c linux-2.6.38.3/drivers/fir p =3D dmi_ioremap(0xF0000, 0x10000); if (p =3D=3D NULL) goto error; -diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38= .3/drivers/gpu/drm/drm_crtc_helper.c ---- linux-2.6.38.3/drivers/gpu/drm/drm_crtc_helper.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/drm_crtc_helper.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38= .4/drivers/gpu/drm/drm_crtc_helper.c +--- linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c 2011-04-17 15:57:32= .000000000 -0400 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d struct drm_crtc *tmp; int crtc_mask =3D 1; @@ -24974,9 +24770,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_crt= c_helper.c linux-2.6.38.3/drive =20 dev =3D crtc->dev; =20 -diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_drv.c linux-2.6.38.3/drive= rs/gpu/drm/drm_drv.c ---- linux-2.6.38.3/drivers/gpu/drm/drm_drv.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/drm_drv.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_drv.c linux-2.6.38.4/drive= rs/gpu/drm/drm_drv.c +--- linux-2.6.38.4/drivers/gpu/drm/drm_drv.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/drm_drv.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp, =20 dev =3D file_priv->minor->dev; @@ -24986,9 +24782,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_drv= .c linux-2.6.38.3/drivers/gpu/d ++file_priv->ioctl_count; =20 DRM_DEBUG("pid=3D%d, cmd=3D0x%02x, nr=3D0x%02x, dev 0x%lx, auth=3D%d\n= ", -diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_fops.c linux-2.6.38.3/driv= ers/gpu/drm/drm_fops.c ---- linux-2.6.38.3/drivers/gpu/drm/drm_fops.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/drm_fops.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_fops.c linux-2.6.38.4/driv= ers/gpu/drm/drm_fops.c +--- linux-2.6.38.4/drivers/gpu/drm/drm_fops.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/drm_fops.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * } =20 @@ -25038,9 +24834,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_fop= s.c linux-2.6.38.3/drivers/gpu/ if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_global.c linux-2.6.38.3/dr= ivers/gpu/drm/drm_global.c ---- linux-2.6.38.3/drivers/gpu/drm/drm_global.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/drm_global.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_global.c linux-2.6.38.4/dr= ivers/gpu/drm/drm_global.c +--- linux-2.6.38.4/drivers/gpu/drm/drm_global.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/drm_global.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -36,7 +36,7 @@ struct drm_global_item { struct mutex mutex; @@ -25098,9 +24894,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_glo= bal.c linux-2.6.38.3/drivers/gp ref->release(ref); item->object =3D NULL; } -diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_info.c linux-2.6.38.3/driv= ers/gpu/drm/drm_info.c ---- linux-2.6.38.3/drivers/gpu/drm/drm_info.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/drm_info.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_info.c linux-2.6.38.4/driv= ers/gpu/drm/drm_info.c +--- linux-2.6.38.4/drivers/gpu/drm/drm_info.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/drm_info.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void struct drm_local_map *map; struct drm_map_list *r_list; @@ -25141,9 +24937,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_inf= o.c linux-2.6.38.3/drivers/gpu/ =20 #if defined(__i386__) pgprot =3D pgprot_val(vma->vm_page_prot); -diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.3/dri= vers/gpu/drm/drm_ioctl.c ---- linux-2.6.38.3/drivers/gpu/drm/drm_ioctl.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.4/dri= vers/gpu/drm/drm_ioctl.c +--- linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev, stats->data[i].value =3D (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lo= ck->lock : 0); @@ -25153,9 +24949,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_ioc= tl.c linux-2.6.38.3/drivers/gpu stats->data[i].type =3D dev->types[i]; } =20 -diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_lock.c linux-2.6.38.3/driv= ers/gpu/drm/drm_lock.c ---- linux-2.6.38.3/drivers/gpu/drm/drm_lock.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/drm_lock.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_lock.c linux-2.6.38.4/driv= ers/gpu/drm/drm_lock.c +--- linux-2.6.38.4/drivers/gpu/drm/drm_lock.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/drm_lock.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv =3D file_priv; @@ -25174,9 +24970,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_loc= k.c linux-2.6.38.3/drivers/gpu/ =20 if (drm_lock_free(&master->lock, lock->context)) { /* FIXME: Should really bail out here. */ -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.3= /drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.38.3/drivers/gpu/drm/i810/i810_dma.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.4= /drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -25199,9 +24995,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i810/i8= 10_dma.c linux-2.6.38.3/drivers sarea_priv->last_enqueue =3D dev_priv->counter - 1; sarea_priv->last_dispatch =3D (int)hw_status[5]; =20 -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38= .3/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38= .4/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:57:32= .000000000 -0400 @@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_ } } @@ -25211,9 +25007,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dv= o_ch7017.c linux-2.6.38.3/drive .init =3D ch7017_init, .detect =3D ch7017_detect, .mode_valid =3D ch7017_mode_valid, -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38= .3/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38= .4/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:57:32= .000000000 -0400 @@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -25223,9 +25019,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dv= o_ch7xxx.c linux-2.6.38.3/drive .init =3D ch7xxx_init, .detect =3D ch7xxx_detect, .mode_valid =3D ch7xxx_mode_valid, -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo.h linux-2.6.38.3/driv= ers/gpu/drm/i915/dvo.h ---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h linux-2.6.38.4/driv= ers/gpu/drm/i915/dvo.h +--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -122,23 +122,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -25258,9 +25054,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dv= o.h linux-2.6.38.3/drivers/gpu/ +extern const struct intel_dvo_dev_ops ch7017_ops; =20 #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.3= /drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.4= /drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv } } @@ -25270,9 +25066,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dv= o_ivch.c linux-2.6.38.3/drivers .init =3D ivch_init, .dpms =3D ivch_dpms, .mode_valid =3D ivch_mode_valid, -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38= .3/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38= .4/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:57:32= .000000000 -0400 @@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_ } } @@ -25282,9 +25078,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dv= o_sil164.c linux-2.6.38.3/drive .init =3D sil164_init, .detect =3D sil164_detect, .mode_valid =3D sil164_mode_valid, -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38= .3/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38= .4/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:57:32= .000000000 -0400 @@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_ } } @@ -25294,9 +25090,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dv= o_tfp410.c linux-2.6.38.3/drive .init =3D tfp410_init, .detect =3D tfp410_detect, .mode_valid =3D tfp410_mode_valid, -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.3= /drivers/gpu/drm/i915/i915_dma.c ---- linux-2.6.38.3/drivers/gpu/drm/i915/i915_dma.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/i915_dma.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.4= /drivers/gpu/drm/i915/i915_dma.c +--- linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -1159,7 +1159,7 @@ static bool i915_switcheroo_can_switch(s bool can_switch; =20 @@ -25306,9 +25102,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i9= 15_dma.c linux-2.6.38.3/drivers spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.3= /drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.4= /drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -673,7 +673,7 @@ static const struct dev_pm_ops i915_pm_o .restore =3D i915_pm_resume, }; @@ -25318,9 +25114,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i9= 15_drv.c linux-2.6.38.3/drivers .fault =3D i915_gem_fault, .open =3D drm_gem_vm_open, .close =3D drm_gem_vm_close, -diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.3= /drivers/gpu/drm/i915/i915_drv.h ---- linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.4= /drivers/gpu/drm/i915/i915_drv.h +--- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -1229,7 +1229,7 @@ extern int intel_setup_gmbus(struct drm_ extern void intel_teardown_gmbus(struct drm_device *dev); extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int spee= d); @@ -25330,9 +25126,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i9= 15_drv.h linux-2.6.38.3/drivers { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; } -diff -urNp linux-2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-= 2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c ---- linux-2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-14 21= :20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-04-17 15= :57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-= 2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c +--- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-14 21= :20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-04-17 15= :57:32.000000000 -0400 @@ -621,7 +621,7 @@ static bool nouveau_switcheroo_can_switc bool can_switch; =20 @@ -25342,9 +25138,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/nouveau= /nouveau_state.c linux-2.6.38.3 spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.= 38.3/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.38.3/drivers/gpu/drm/radeon/mkregtable.c 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.= 38.4/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:57:= 32.000000000 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t,=20 regex_t mask_rex; regmatch_t match[4]; @@ -25362,9 +25158,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/= mkregtable.c linux-2.6.38.3/dri =20 if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_device.c linux-2= .6.38.3/drivers/gpu/drm/radeon/radeon_device.c ---- linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_device.c 2011-03-14 21:= 20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_device.c 2011-04-17 15:= 57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c linux-2= .6.38.4/drivers/gpu/drm/radeon/radeon_device.c +--- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c 2011-03-14 21:= 20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c 2011-04-17 15:= 57:32.000000000 -0400 @@ -673,7 +673,7 @@ static bool radeon_switcheroo_can_switch bool can_switch; =20 @@ -25374,9 +25170,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/= radeon_device.c linux-2.6.38.3/ spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.= 6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c ---- linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-14 21:2= 0:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-17 15:5= 7:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.= 6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c +--- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-14 21:2= 0:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-17 15:5= 7:32.000000000 -0400 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str request =3D compat_alloc_user_space(sizeof(*request)); if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) @@ -25386,9 +25182,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/= radeon_ioc32.c linux-2.6.38.3/d &request->value)) return -EFAULT; =20 -diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_state.c linux-2.= 6.38.3/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_state.c 2011-03-14 21:2= 0:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:5= 7:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.= 6.38.4/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c 2011-03-14 21:2= 0:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:5= 7:32.000000000 -0400 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS) sarea_priv->nbox =3D RADEON_NR_SAREA_CLIPRECTS; @@ -25407,9 +25203,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/= radeon_state.c linux-2.6.38.3/d =20 DRM_DEBUG("pid=3D%d\n", DRM_CURRENTPID); =20 -diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.= 38.3/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.= 38.4/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:57:= 32.000000000 -0400 @@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(str man->size =3D size >> PAGE_SHIFT; } @@ -25470,9 +25266,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/= radeon_ttm.c linux-2.6.38.3/dri vma->vm_ops =3D &radeon_ttm_vm_ops; return 0; } -diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.3/= drivers/gpu/drm/radeon/rs690.c ---- linux-2.6.38.3/drivers/gpu/drm/radeon/rs690.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.4/= drivers/gpu/drm/radeon/rs690.c +--- linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) @@ -25486,21 +25282,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon= /rs690.c linux-2.6.38.3/drivers/ } else { if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) -diff -urNp linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.38.3/dr= ivers/gpu/drm/ttm/ttm_bo.c ---- linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo.c 2011-04-17 15:57:32.0000= 00000 -0400 -@@ -40,7 +40,7 @@ - #include -=20 - #define TTM_ASSERT_LOCKED(param) --#define TTM_DEBUG(fmt, arg...) -+#define TTM_DEBUG(fmt, arg...) do {} while (0) - #define TTM_BO_HASH_ORDER 13 -=20 - static int ttm_bo_setup_vm(struct ttm_buffer_object *bo); -diff -urNp linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.3= /drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.4= /drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_ return best_bo; } @@ -25558,9 +25342,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/ttm/ttm= _bo_vm.c linux-2.6.38.3/drivers =20 static const struct vm_operations_struct ttm_bo_vm_ops =3D { .fault =3D ttm_bo_vm_fault, -diff -urNp linux-2.6.38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6= .38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c ---- linux-2.6.38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6= .38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +--- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-04-17 15:57= :32.000000000 -0400 @@ -534,7 +534,7 @@ static int vmw_fifo_vm_fault(struct vm_a return VM_FAULT_SIGBUS; } @@ -25570,9 +25354,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/vmwgfx/= vmwgfx_fifo.c linux-2.6.38.3/dr .fault =3D vmw_fifo_vm_fault, .open =3D NULL, .close =3D NULL -diff -urNp linux-2.6.38.3/drivers/hid/usbhid/hiddev.c linux-2.6.38.3/dri= vers/hid/usbhid/hiddev.c ---- linux-2.6.38.3/drivers/hid/usbhid/hiddev.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/hid/usbhid/hiddev.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/hid/usbhid/hiddev.c linux-2.6.38.4/dri= vers/hid/usbhid/hiddev.c +--- linux-2.6.38.4/drivers/hid/usbhid/hiddev.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/hid/usbhid/hiddev.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi break; =20 @@ -25582,57 +25366,9 @@ diff -urNp linux-2.6.38.3/drivers/hid/usbhid/hid= dev.c linux-2.6.38.3/drivers/hid break; =20 for (i =3D 0; i < hid->maxcollection; i++) -diff -urNp linux-2.6.38.3/drivers/hwmon/k8temp.c linux-2.6.38.3/drivers/= hwmon/k8temp.c ---- linux-2.6.38.3/drivers/hwmon/k8temp.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/hwmon/k8temp.c 2011-04-17 15:57:32.000000000 = -0400 -@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n -=20 - static const struct pci_device_id k8temp_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, -- { 0 }, -+ { 0, 0, 0, 0, 0, 0, 0 }, - }; -=20 - MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.38.3/drivers/hwmon/sis5595.c linux-2.6.38.3/drivers= /hwmon/sis5595.c ---- linux-2.6.38.3/drivers/hwmon/sis5595.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/hwmon/sis5595.c 2011-04-17 15:57:32.000000000= -0400 -@@ -701,7 +701,7 @@ static struct sis5595_data *sis5595_upda -=20 - static const struct pci_device_id sis5595_pci_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.38.3/drivers/hwmon/via686a.c linux-2.6.38.3/drivers= /hwmon/via686a.c ---- linux-2.6.38.3/drivers/hwmon/via686a.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/hwmon/via686a.c 2011-04-17 15:57:32.000000000= -0400 -@@ -779,7 +779,7 @@ static struct via686a_data *via686a_upda -=20 - static const struct pci_device_id via686a_pci_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.38.3/drivers/hwmon/vt8231.c linux-2.6.38.3/drivers/= hwmon/vt8231.c ---- linux-2.6.38.3/drivers/hwmon/vt8231.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/hwmon/vt8231.c 2011-04-17 15:57:32.000000000 = -0400 -@@ -701,7 +701,7 @@ static struct platform_driver vt8231_dri -=20 - static const struct pci_device_id vt8231_pci_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.38.3/drivers/hwmon/w83791d.c linux-2.6.38.3/drivers= /hwmon/w83791d.c ---- linux-2.6.38.3/drivers/hwmon/w83791d.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/hwmon/w83791d.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/hwmon/w83791d.c linux-2.6.38.4/drivers= /hwmon/w83791d.c +--- linux-2.6.38.4/drivers/hwmon/w83791d.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/hwmon/w83791d.c 2011-04-17 15:57:32.000000000= -0400 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -25644,66 +25380,9 @@ diff -urNp linux-2.6.38.3/drivers/hwmon/w83791d.= c linux-2.6.38.3/drivers/hwmon/w static struct w83791d_data *w83791d_update_device(struct device *dev); =20 #ifdef DEBUG -diff -urNp linux-2.6.38.3/drivers/i2c/busses/i2c-i801.c linux-2.6.38.3/d= rivers/i2c/busses/i2c-i801.c ---- linux-2.6.38.3/drivers/i2c/busses/i2c-i801.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/i2c/busses/i2c-i801.c 2011-04-17 15:57:32.000= 000000 -0400 -@@ -621,7 +621,7 @@ static const struct pci_device_id i801_i - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_I= DF0) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_I= DF1) }, - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_I= DF2) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, i801_ids); -diff -urNp linux-2.6.38.3/drivers/i2c/busses/i2c-piix4.c linux-2.6.38.3/= drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.38.3/drivers/i2c/busses/i2c-piix4.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/i2c/busses/i2c-piix4.c 2011-04-17 15:57:32.00= 0000000 -0400 -@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat - .ident =3D "IBM", - .matches =3D { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, - }, -- { }, -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, -@@ -491,7 +491,7 @@ static const struct pci_device_id piix4_ - PCI_DEVICE_ID_SERVERWORKS_HT1000SB) }, - { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, - PCI_DEVICE_ID_SERVERWORKS_HT1100LD) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.38.3/drivers/i2c/busses/i2c-sis630.c linux-2.6.38.3= /drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.38.3/drivers/i2c/busses/i2c-sis630.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/i2c/busses/i2c-sis630.c 2011-04-17 15:57:32.0= 00000000 -0400 -@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter - static const struct pci_device_id sis630_ids[] __devinitconst =3D { - { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, - { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.38.3/drivers/i2c/busses/i2c-sis96x.c linux-2.6.38.3= /drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.38.3/drivers/i2c/busses/i2c-sis96x.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/i2c/busses/i2c-sis96x.c 2011-04-17 15:57:32.0= 00000000 -0400 -@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter -=20 - static const struct pci_device_id sis96x_ids[] =3D { - { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.38.3/drivers/ide/ide-cd.c linux-2.6.38.3/drivers/id= e/ide-cd.c ---- linux-2.6.38.3/drivers/ide/ide-cd.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/drivers/ide/ide-cd.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/drivers/ide/ide-cd.c linux-2.6.38.4/drivers/id= e/ide-cd.c +--- linux-2.6.38.4/drivers/ide/ide-cd.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/drivers/ide/ide-cd.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment =3D queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -25713,9 +25392,9 @@ diff -urNp linux-2.6.38.3/drivers/ide/ide-cd.c li= nux-2.6.38.3/drivers/ide/ide-cd drive->dma =3D 0; } } -diff -urNp linux-2.6.38.3/drivers/infiniband/core/cm.c linux-2.6.38.3/dr= ivers/infiniband/core/cm.c ---- linux-2.6.38.3/drivers/infiniband/core/cm.c 2011-04-18 17:27:14.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/infiniband/core/cm.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/infiniband/core/cm.c linux-2.6.38.4/dr= ivers/infiniband/core/cm.c +--- linux-2.6.38.4/drivers/infiniband/core/cm.c 2011-04-18 17:27:14.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/infiniband/core/cm.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -113,7 +113,7 @@ static char const counter_group_names[CM =20 struct cm_counter_group { @@ -25855,9 +25534,9 @@ diff -urNp linux-2.6.38.3/drivers/infiniband/core= /cm.c linux-2.6.38.3/drivers/in } =20 static const struct sysfs_ops cm_counter_ops =3D { -diff -urNp linux-2.6.38.3/drivers/infiniband/hw/qib/qib.h linux-2.6.38.3= /drivers/infiniband/hw/qib/qib.h ---- linux-2.6.38.3/drivers/infiniband/hw/qib/qib.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/infiniband/hw/qib/qib.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h linux-2.6.38.4= /drivers/infiniband/hw/qib/qib.h +--- linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -51,6 +51,7 @@ #include #include @@ -25866,77 +25545,9 @@ diff -urNp linux-2.6.38.3/drivers/infiniband/hw/= qib/qib.h linux-2.6.38.3/drivers =20 #include "qib_common.h" #include "qib_verbs.h" -diff -urNp linux-2.6.38.3/drivers/input/keyboard/atkbd.c linux-2.6.38.3/= drivers/input/keyboard/atkbd.c ---- linux-2.6.38.3/drivers/input/keyboard/atkbd.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/input/keyboard/atkbd.c 2011-04-17 15:57:32.00= 0000000 -0400 -@@ -1250,7 +1250,7 @@ static struct serio_device_id atkbd_seri - .id =3D SERIO_ANY, - .extra =3D SERIO_ANY, - }, -- { 0 } -+ { 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.38.3/drivers/input/mouse/lifebook.c linux-2.6.38.3/= drivers/input/mouse/lifebook.c ---- linux-2.6.38.3/drivers/input/mouse/lifebook.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/input/mouse/lifebook.c 2011-04-17 15:57:32.00= 0000000 -0400 -@@ -123,7 +123,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} - }; -=20 - void __init lifebook_module_init(void) -diff -urNp linux-2.6.38.3/drivers/input/mouse/psmouse-base.c linux-2.6.3= 8.3/drivers/input/mouse/psmouse-base.c ---- linux-2.6.38.3/drivers/input/mouse/psmouse-base.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/drivers/input/mouse/psmouse-base.c 2011-04-17 15:57:3= 2.000000000 -0400 -@@ -1462,7 +1462,7 @@ static struct serio_device_id psmouse_se - .id =3D SERIO_ANY, - .extra =3D SERIO_ANY, - }, -- { 0 } -+ { 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.38.3/drivers/input/mouse/synaptics.c linux-2.6.38.3= /drivers/input/mouse/synaptics.c ---- linux-2.6.38.3/drivers/input/mouse/synaptics.c 2011-04-18 17:27:18.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/input/mouse/synaptics.c 2011-04-17 16:53:16.0= 00000000 -0400 -@@ -559,7 +559,7 @@ static void synaptics_process_packet(str - break; - case 2: - if (SYN_MODEL_PEN(priv->model_id)) -- ; /* Nothing, treat a pen as a single finger */ -+ break; /* Nothing, treat a pen as a single finger */ - break; - case 4 ... 15: - if (SYN_CAP_PALMDETECT(priv->capabilities)) -@@ -825,7 +825,6 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), - DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"), - }, -- - }, - { - /* Toshiba Portege M300 */ -@@ -834,10 +833,9 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"), - DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"), - }, -- - }, -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - #endif -- { } - }; -=20 - static bool broken_olpc_ec; -diff -urNp linux-2.6.38.3/drivers/input/mousedev.c linux-2.6.38.3/driver= s/input/mousedev.c ---- linux-2.6.38.3/drivers/input/mousedev.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/input/mousedev.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/input/mousedev.c linux-2.6.38.4/driver= s/input/mousedev.c +--- linux-2.6.38.4/drivers/input/mousedev.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/input/mousedev.c 2011-04-23 12:47:28.00000000= 0 -0400 @@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file =20 spin_unlock_irq(&client->packet_lock); @@ -25946,87 +25557,9 @@ diff -urNp linux-2.6.38.3/drivers/input/mousedev= .c linux-2.6.38.3/drivers/input/ return -EFAULT; =20 return count; -@@ -1067,7 +1067,7 @@ static struct input_handler mousedev_han -=20 - #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX - static struct miscdevice psaux_mouse =3D { -- PSMOUSE_MINOR, "psaux", &mousedev_fops -+ PSMOUSE_MINOR, "psaux", &mousedev_fops, {NULL, NULL}, NULL, NULL - }; - static int psaux_registered; - #endif -diff -urNp linux-2.6.38.3/drivers/input/serio/i8042-x86ia64io.h linux-2.= 6.38.3/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.38.3/drivers/input/serio/i8042-x86ia64io.h 2011-03-14 21:2= 0:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/input/serio/i8042-x86ia64io.h 2011-04-17 15:5= 7:32.000000000 -0400 -@@ -183,7 +183,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - /* -@@ -431,7 +431,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static const struct dmi_system_id __initconst i8042_dmi_reset_table[] =3D= { -@@ -505,7 +505,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - #ifdef CONFIG_PNP -@@ -524,7 +524,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = =3D { -@@ -548,7 +548,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; - #endif -=20 -@@ -640,7 +640,7 @@ static const struct dmi_system_id __init - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), - }, - }, -- { } -+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } - }; -=20 - #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.38.3/drivers/input/serio/serio_raw.c linux-2.6.38.3= /drivers/input/serio/serio_raw.c ---- linux-2.6.38.3/drivers/input/serio/serio_raw.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/input/serio/serio_raw.c 2011-04-17 15:57:32.0= 00000000 -0400 -@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_ - .id =3D SERIO_ANY, - .extra =3D SERIO_ANY, - }, -- { 0 } -+ { 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/common.c linux-2.6.38.3/d= rivers/isdn/gigaset/common.c ---- linux-2.6.38.3/drivers/isdn/gigaset/common.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/isdn/gigaset/common.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/common.c linux-2.6.38.4/d= rivers/isdn/gigaset/common.c +--- linux-2.6.38.4/drivers/isdn/gigaset/common.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/isdn/gigaset/common.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct=20 cs->commands_pending =3D 0; cs->cur_at_seq =3D 0; @@ -26036,9 +25569,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/co= mmon.c linux-2.6.38.3/drivers/i cs->dev =3D NULL; cs->tty =3D NULL; cs->tty_dev =3D NULL; -diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/gigaset.h linux-2.6.38.3/= drivers/isdn/gigaset/gigaset.h ---- linux-2.6.38.3/drivers/isdn/gigaset/gigaset.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h linux-2.6.38.4/= drivers/isdn/gigaset/gigaset.h +--- linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -35,6 +35,7 @@ #include #include @@ -26056,9 +25589,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/gi= gaset.h linux-2.6.38.3/drivers/ struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/interface.c linux-2.6.38.= 3/drivers/isdn/gigaset/interface.c ---- linux-2.6.38.3/drivers/isdn/gigaset/interface.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/isdn/gigaset/interface.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/interface.c linux-2.6.38.= 4/drivers/isdn/gigaset/interface.c +--- linux-2.6.38.4/drivers/isdn/gigaset/interface.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/isdn/gigaset/interface.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; tty->driver_data =3D cs; @@ -26146,9 +25679,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/in= terface.c linux-2.6.38.3/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.38.3/drivers/isdn/hardware/avm/b1.c linux-2.6.38.3/= drivers/isdn/hardware/avm/b1.c ---- linux-2.6.38.3/drivers/isdn/hardware/avm/b1.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c linux-2.6.38.4/= drivers/isdn/hardware/avm/b1.c +--- linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -26167,9 +25700,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/hardware/a= vm/b1.c linux-2.6.38.3/drivers/ return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.38.3/drivers/isdn/icn/icn.c linux-2.6.38.3/drivers/= isdn/icn/icn.c ---- linux-2.6.38.3/drivers/isdn/icn/icn.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/isdn/icn/icn.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/isdn/icn/icn.c linux-2.6.38.4/drivers/= isdn/icn/icn.c +--- linux-2.6.38.4/drivers/isdn/icn/icn.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/isdn/icn/icn.c 2011-04-17 15:57:32.000000000 = -0400 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count =3D len; @@ -26179,9 +25712,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/icn/icn.c = linux-2.6.38.3/drivers/isdn/icn return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.38.3/drivers/lguest/core.c linux-2.6.38.3/drivers/l= guest/core.c ---- linux-2.6.38.3/drivers/lguest/core.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/lguest/core.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/lguest/core.c linux-2.6.38.4/drivers/l= guest/core.c +--- linux-2.6.38.4/drivers/lguest/core.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/lguest/core.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -92,9 +92,17 @@ static __init int map_switcher(void) * it's worked so far. The end address needs +1 because __get_vm_area * allocates an extra guard page, so we need space for that. @@ -26209,9 +25742,9 @@ diff -urNp linux-2.6.38.3/drivers/lguest/core.c l= inux-2.6.38.3/drivers/lguest/co end_switcher_text - start_switcher_text); =20 printk(KERN_INFO "lguest: mapped switcher at %p\n", -diff -urNp linux-2.6.38.3/drivers/lguest/x86/core.c linux-2.6.38.3/drive= rs/lguest/x86/core.c ---- linux-2.6.38.3/drivers/lguest/x86/core.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/lguest/x86/core.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/lguest/x86/core.c linux-2.6.38.4/drive= rs/lguest/x86/core.c +--- linux-2.6.38.4/drivers/lguest/x86/core.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/lguest/x86/core.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -59,7 +59,7 @@ static struct { /* Offset from where switcher.S was compiled to where we've copied it *= / static unsigned long switcher_offset(void) @@ -26253,9 +25786,9 @@ diff -urNp linux-2.6.38.3/drivers/lguest/x86/core= .c linux-2.6.38.3/drivers/lgues lguest_entry.segment =3D LGUEST_CS; =20 /* -diff -urNp linux-2.6.38.3/drivers/lguest/x86/switcher_32.S linux-2.6.38.= 3/drivers/lguest/x86/switcher_32.S ---- linux-2.6.38.3/drivers/lguest/x86/switcher_32.S 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/lguest/x86/switcher_32.S 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/lguest/x86/switcher_32.S linux-2.6.38.= 4/drivers/lguest/x86/switcher_32.S +--- linux-2.6.38.4/drivers/lguest/x86/switcher_32.S 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/lguest/x86/switcher_32.S 2011-04-17 15:57:32.= 000000000 -0400 @@ -87,6 +87,7 @@ #include #include @@ -26314,21 +25847,9 @@ diff -urNp linux-2.6.38.3/drivers/lguest/x86/swi= tcher_32.S linux-2.6.38.3/driver =20 // Every interrupt can come to us here // But we must truly tell each apart. -diff -urNp linux-2.6.38.3/drivers/md/bitmap.c linux-2.6.38.3/drivers/md/= bitmap.c ---- linux-2.6.38.3/drivers/md/bitmap.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/md/bitmap.c 2011-04-17 15:57:32.000000000 -04= 00 -@@ -55,7 +55,7 @@ - # if DEBUG > 0 - # define PRINTK(x...) printk(KERN_DEBUG x) - # else --# define PRINTK(x...) -+# define PRINTK(x...) do {} while (0) - # endif - #endif -=20 -diff -urNp linux-2.6.38.3/drivers/md/dm-ioctl.c linux-2.6.38.3/drivers/m= d/dm-ioctl.c ---- linux-2.6.38.3/drivers/md/dm-ioctl.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/md/dm-ioctl.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/md/dm-ioctl.c linux-2.6.38.4/drivers/m= d/dm-ioctl.c +--- linux-2.6.38.4/drivers/md/dm-ioctl.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/md/dm-ioctl.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -1541,7 +1541,7 @@ static int validate_params(uint cmd, str cmd =3D=3D DM_LIST_VERSIONS_CMD) return 0; @@ -26338,9 +25859,9 @@ diff -urNp linux-2.6.38.3/drivers/md/dm-ioctl.c l= inux-2.6.38.3/drivers/md/dm-ioc if (!*param->name) { DMWARN("name not supplied when creating device"); return -EINVAL; -diff -urNp linux-2.6.38.3/drivers/md/dm-table.c linux-2.6.38.3/drivers/m= d/dm-table.c ---- linux-2.6.38.3/drivers/md/dm-table.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/md/dm-table.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/md/dm-table.c linux-2.6.38.4/drivers/m= d/dm-table.c +--- linux-2.6.38.4/drivers/md/dm-table.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/md/dm-table.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -372,7 +372,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -26350,36 +25871,9 @@ diff -urNp linux-2.6.38.3/drivers/md/dm-table.c = linux-2.6.38.3/drivers/md/dm-tab DMWARN("%s: %s too small for target: " "start=3D%llu, len=3D%llu, dev_size=3D%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.38.3/drivers/md/md.c linux-2.6.38.3/drivers/md/md.c ---- linux-2.6.38.3/drivers/md/md.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/md/md.c 2011-04-17 15:57:32.000000000 -0400 -@@ -1889,7 +1889,7 @@ static int bind_rdev_to_array(mdk_rdev_t -=20 - ko =3D &part_to_dev(rdev->bdev->bd_part)->kobj; - if (sysfs_create_link(&rdev->kobj, ko, "block")) -- /* failure here is OK */; -+ /* failure here is OK */{} - rdev->sysfs_state =3D sysfs_get_dirent_safe(rdev->kobj.sd, "state"); -=20 - list_add_rcu(&rdev->same_set, &mddev->disks); -@@ -2499,7 +2499,7 @@ slot_store(mdk_rdev_t *rdev, const char=20 - sysfs_notify_dirent_safe(rdev->sysfs_state); - sprintf(nm, "rd%d", rdev->raid_disk); - if (sysfs_create_link(&rdev->mddev->kobj, &rdev->kobj, nm)) -- /* failure here is OK */; -+ /* failure here is OK */{} - /* don't wakeup anyone, leave that to userspace. */ - } else { - if (slot >=3D rdev->mddev->raid_disks && -@@ -4594,7 +4594,7 @@ int md_run(mddev_t *mddev) - char nm[20]; - sprintf(nm, "rd%d", rdev->raid_disk); - if (sysfs_create_link(&mddev->kobj, &rdev->kobj, nm)) -- /* failure here is OK */; -+ /* failure here is OK */{} - } - =09 - set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); +diff -urNp linux-2.6.38.4/drivers/md/md.c linux-2.6.38.4/drivers/md/md.c +--- linux-2.6.38.4/drivers/md/md.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/md/md.c 2011-04-23 12:47:28.000000000 -0400 @@ -6462,7 +6462,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { @@ -26398,18 +25892,9 @@ diff -urNp linux-2.6.38.3/drivers/md/md.c linux-= 2.6.38.3/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -@@ -7070,7 +7070,7 @@ static int remove_and_add_spares(mddev_t - sprintf(nm, "rd%d", rdev->raid_disk); - if (sysfs_create_link(&mddev->kobj, - &rdev->kobj, nm)) -- /* failure here is OK */; -+ /* failure here is OK */{} - spares++; - md_new_event(mddev); - set_bit(MD_CHANGE_DEVS, &mddev->flags); -diff -urNp linux-2.6.38.3/drivers/md/md.h linux-2.6.38.3/drivers/md/md.h ---- linux-2.6.38.3/drivers/md/md.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/md/md.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/md/md.h linux-2.6.38.4/drivers/md/md.h +--- linux-2.6.38.4/drivers/md/md.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/md/md.h 2011-04-17 15:57:32.000000000 -0400 @@ -360,7 +360,7 @@ static inline void rdev_dec_pending(mdk_ =20 static inline void md_sync_acct(struct block_device *bdev, unsigned lon= g nr_sectors) @@ -26419,9 +25904,9 @@ diff -urNp linux-2.6.38.3/drivers/md/md.h linux-2= .6.38.3/drivers/md/md.h } =20 struct mdk_personality -diff -urNp linux-2.6.38.3/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.= 38.3/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.38.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.= 38.4/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-17 15:57:= 32.000000000 -0400 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -26431,9 +25916,9 @@ diff -urNp linux-2.6.38.3/drivers/media/dvb/dvb-c= ore/dvbdev.c linux-2.6.38.3/dri struct device *clsdev; int minor; int id; -diff -urNp linux-2.6.38.3/drivers/media/radio/radio-cadet.c linux-2.6.38= .3/drivers/media/radio/radio-cadet.c ---- linux-2.6.38.3/drivers/media/radio/radio-cadet.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/media/radio/radio-cadet.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/media/radio/radio-cadet.c linux-2.6.38= .4/drivers/media/radio/radio-cadet.c +--- linux-2.6.38.4/drivers/media/radio/radio-cadet.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/media/radio/radio-cadet.c 2011-04-17 15:57:32= .000000000 -0400 @@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f readbuf[i++] =3D dev->rdsbuf[dev->rdsout++]; mutex_unlock(&dev->lock); @@ -26443,9 +25928,9 @@ diff -urNp linux-2.6.38.3/drivers/media/radio/rad= io-cadet.c linux-2.6.38.3/drive return -EFAULT; return i; } -diff -urNp linux-2.6.38.3/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.= 3/drivers/media/rc/ir-lirc-codec.c ---- linux-2.6.38.3/drivers/media/rc/ir-lirc-codec.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/media/rc/ir-lirc-codec.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.= 4/drivers/media/rc/ir-lirc-codec.c +--- linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -277,7 +277,7 @@ static void ir_lirc_close(void *data) return; } @@ -26455,9 +25940,9 @@ diff -urNp linux-2.6.38.3/drivers/media/rc/ir-lir= c-codec.c linux-2.6.38.3/driver .owner =3D THIS_MODULE, .write =3D ir_lirc_transmit_ir, .unlocked_ioctl =3D ir_lirc_ioctl, -diff -urNp linux-2.6.38.3/drivers/media/rc/lirc_dev.c linux-2.6.38.3/dri= vers/media/rc/lirc_dev.c ---- linux-2.6.38.3/drivers/media/rc/lirc_dev.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/media/rc/lirc_dev.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/media/rc/lirc_dev.c linux-2.6.38.4/dri= vers/media/rc/lirc_dev.c +--- linux-2.6.38.4/drivers/media/rc/lirc_dev.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/media/rc/lirc_dev.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -151,7 +151,7 @@ static int lirc_thread(void *irctl) } =20 @@ -26467,25 +25952,9 @@ diff -urNp linux-2.6.38.3/drivers/media/rc/lirc_= dev.c linux-2.6.38.3/drivers/med .owner =3D THIS_MODULE, .read =3D lirc_dev_fop_read, .write =3D lirc_dev_fop_write, -diff -urNp linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c lin= ux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c ---- linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c 2011-03-14= 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c 2011-04-17= 15:57:32.000000000 -0400 -@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_ - sn9c102_show_i2c_reg, sn9c102_store_i2c_reg); - static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR, - sn9c102_show_i2c_val, sn9c102_store_i2c_val); --static DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green); --static DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue); --static DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red); -+static DEVICE_ATTR(green, S_IWUSR, NULL, sn9c102_store_green); -+static DEVICE_ATTR(blue, S_IWUSR, NULL, sn9c102_store_blue); -+static DEVICE_ATTR(red, S_IWUSR, NULL, sn9c102_store_red); - static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NU= LL); -=20 -=20 -diff -urNp linux-2.6.38.3/drivers/message/fusion/mptbase.c linux-2.6.38.= 3/drivers/message/fusion/mptbase.c ---- linux-2.6.38.3/drivers/message/fusion/mptbase.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/message/fusion/mptbase.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/message/fusion/mptbase.c linux-2.6.38.= 4/drivers/message/fusion/mptbase.c +--- linux-2.6.38.4/drivers/message/fusion/mptbase.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/message/fusion/mptbase.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct=20 seq_printf(m, " MaxChainDepth =3D 0x%02x frames\n", ioc->facts.MaxCha= inDepth); seq_printf(m, " MinBlockSize =3D 0x%02x bytes\n", 4*ioc->facts.BlockS= ize); @@ -26500,21 +25969,9 @@ diff -urNp linux-2.6.38.3/drivers/message/fusion= /mptbase.c linux-2.6.38.3/driver /* * Rounding UP to nearest 4-kB boundary here... */ -diff -urNp linux-2.6.38.3/drivers/message/fusion/mptdebug.h linux-2.6.38= .3/drivers/message/fusion/mptdebug.h ---- linux-2.6.38.3/drivers/message/fusion/mptdebug.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/message/fusion/mptdebug.h 2011-04-17 15:57:32= .000000000 -0400 -@@ -71,7 +71,7 @@ - CMD; \ - } - #else --#define MPT_CHECK_LOGGING(IOC, CMD, BITS) -+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) - #endif -=20 -=20 -diff -urNp linux-2.6.38.3/drivers/message/fusion/mptsas.c linux-2.6.38.3= /drivers/message/fusion/mptsas.c ---- linux-2.6.38.3/drivers/message/fusion/mptsas.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/message/fusion/mptsas.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/message/fusion/mptsas.c linux-2.6.38.4= /drivers/message/fusion/mptsas.c +--- linux-2.6.38.4/drivers/message/fusion/mptsas.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/message/fusion/mptsas.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -26563,9 +26020,9 @@ diff -urNp linux-2.6.38.3/drivers/message/fusion/= mptsas.c linux-2.6.38.3/drivers static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-2.6.38.3/drivers/message/fusion/mptscsih.c linux-2.6.38= .3/drivers/message/fusion/mptscsih.c ---- linux-2.6.38.3/drivers/message/fusion/mptscsih.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/message/fusion/mptscsih.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/message/fusion/mptscsih.c linux-2.6.38= .4/drivers/message/fusion/mptscsih.c +--- linux-2.6.38.4/drivers/message/fusion/mptscsih.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/message/fusion/mptscsih.c 2011-04-17 15:57:32= .000000000 -0400 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost) =20 h =3D shost_priv(SChost); @@ -26591,9 +26048,9 @@ diff -urNp linux-2.6.38.3/drivers/message/fusion/= mptscsih.c linux-2.6.38.3/drive =20 return h->info_kbuf; } -diff -urNp linux-2.6.38.3/drivers/message/i2o/i2o_proc.c linux-2.6.38.3/= drivers/message/i2o/i2o_proc.c ---- linux-2.6.38.3/drivers/message/i2o/i2o_proc.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/message/i2o/i2o_proc.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/drivers/message/i2o/i2o_proc.c linux-2.6.38.4/= drivers/message/i2o/i2o_proc.c +--- linux-2.6.38.4/drivers/message/i2o/i2o_proc.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/drivers/message/i2o/i2o_proc.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -255,13 +255,6 @@ static char *scsi_devices[] =3D { "Array Controller Device" }; @@ -26680,9 +26137,9 @@ diff -urNp linux-2.6.38.3/drivers/message/i2o/i2o= _proc.c linux-2.6.38.3/drivers/ =20 return 0; } -diff -urNp linux-2.6.38.3/drivers/mfd/janz-cmodio.c linux-2.6.38.3/drive= rs/mfd/janz-cmodio.c ---- linux-2.6.38.3/drivers/mfd/janz-cmodio.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/mfd/janz-cmodio.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/mfd/janz-cmodio.c linux-2.6.38.4/drive= rs/mfd/janz-cmodio.c +--- linux-2.6.38.4/drivers/mfd/janz-cmodio.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/mfd/janz-cmodio.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -13,6 +13,7 @@ =20 #include @@ -26691,9 +26148,9 @@ diff -urNp linux-2.6.38.3/drivers/mfd/janz-cmodio= .c linux-2.6.38.3/drivers/mfd/j #include #include #include -diff -urNp linux-2.6.38.3/drivers/misc/kgdbts.c linux-2.6.38.3/drivers/m= isc/kgdbts.c ---- linux-2.6.38.3/drivers/misc/kgdbts.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/misc/kgdbts.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/misc/kgdbts.c linux-2.6.38.4/drivers/m= isc/kgdbts.c +--- linux-2.6.38.4/drivers/misc/kgdbts.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/misc/kgdbts.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -26712,9 +26169,9 @@ diff -urNp linux-2.6.38.3/drivers/misc/kgdbts.c l= inux-2.6.38.3/drivers/misc/kgdb .name =3D "kgdbts", .read_char =3D kgdbts_get_char, .write_char =3D kgdbts_put_char, -diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38= .3/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.38.3/drivers/misc/sgi-gru/gruhandles.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38= .4/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:57:32= .000000000 -0400 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op unsigned long nsec; =20 @@ -26726,9 +26183,9 @@ diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gr= uhandles.c linux-2.6.38.3/drive if (mcs_op_statistics[op].max < nsec) mcs_op_statistics[op].max =3D nsec; } -diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.= 3/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.38.3/drivers/misc/sgi-gru/gruprocfs.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.= 4/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -32,9 +32,9 @@ =20 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -26752,9 +26209,9 @@ diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gr= uprocfs.c linux-2.6.38.3/driver max =3D mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/grutables.h linux-2.6.38.= 3/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.38.3/drivers/misc/sgi-gru/grutables.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h linux-2.6.38.= 4/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -26934,9 +26391,9 @@ diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gr= utables.h linux-2.6.38.3/driver } while (0) =20 #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.38.3/drivers/mtd/devices/doc2000.c linux-2.6.38.3/d= rivers/mtd/devices/doc2000.c ---- linux-2.6.38.3/drivers/mtd/devices/doc2000.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/mtd/devices/doc2000.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2000.c linux-2.6.38.4/d= rivers/mtd/devices/doc2000.c +--- linux-2.6.38.4/drivers/mtd/devices/doc2000.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/mtd/devices/doc2000.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt =20 /* The ECC will not be calculated correctly if less than 512 is writt= en */ @@ -26946,9 +26403,9 @@ diff -urNp linux-2.6.38.3/drivers/mtd/devices/doc= 2000.c linux-2.6.38.3/drivers/m printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.38.3/drivers/mtd/devices/doc2001.c linux-2.6.38.3/d= rivers/mtd/devices/doc2001.c ---- linux-2.6.38.3/drivers/mtd/devices/doc2001.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/mtd/devices/doc2001.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2001.c linux-2.6.38.4/d= rivers/mtd/devices/doc2001.c +--- linux-2.6.38.4/drivers/mtd/devices/doc2001.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/mtd/devices/doc2001.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip =3D &this->chips[from >> (this->chipshift)]; =20 @@ -26958,9 +26415,9 @@ diff -urNp linux-2.6.38.3/drivers/mtd/devices/doc= 2001.c linux-2.6.38.3/drivers/m return -EINVAL; =20 /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.38.3/drivers/mtd/nand/denali.c linux-2.6.38.3/drive= rs/mtd/nand/denali.c ---- linux-2.6.38.3/drivers/mtd/nand/denali.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/mtd/nand/denali.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/mtd/nand/denali.c linux-2.6.38.4/drive= rs/mtd/nand/denali.c +--- linux-2.6.38.4/drivers/mtd/nand/denali.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/mtd/nand/denali.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -25,6 +25,7 @@ #include #include @@ -26969,9 +26426,9 @@ diff -urNp linux-2.6.38.3/drivers/mtd/nand/denali= .c linux-2.6.38.3/drivers/mtd/n =20 #include "denali.h" =20 -diff -urNp linux-2.6.38.3/drivers/mtd/ubi/build.c linux-2.6.38.3/drivers= /mtd/ubi/build.c ---- linux-2.6.38.3/drivers/mtd/ubi/build.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/mtd/ubi/build.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/mtd/ubi/build.c linux-2.6.38.4/drivers= /mtd/ubi/build.c +--- linux-2.6.38.4/drivers/mtd/ubi/build.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/mtd/ubi/build.c 2011-04-17 15:57:32.000000000= -0400 @@ -1285,7 +1285,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -27011,9 +26468,9 @@ diff -urNp linux-2.6.38.3/drivers/mtd/ubi/build.c= linux-2.6.38.3/drivers/mtd/ubi } =20 /** -diff -urNp linux-2.6.38.3/drivers/net/e1000e/82571.c linux-2.6.38.3/driv= ers/net/e1000e/82571.c ---- linux-2.6.38.3/drivers/net/e1000e/82571.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/net/e1000e/82571.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/e1000e/82571.c linux-2.6.38.4/driv= ers/net/e1000e/82571.c +--- linux-2.6.38.4/drivers/net/e1000e/82571.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/net/e1000e/82571.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw =3D &adapter->hw; @@ -27068,9 +26525,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/8257= 1.c linux-2.6.38.3/drivers/net/ .acquire =3D e1000_acquire_nvm_82571, .read =3D e1000e_read_nvm_eerd, .release =3D e1000_release_nvm_82571, -diff -urNp linux-2.6.38.3/drivers/net/e1000e/e1000.h linux-2.6.38.3/driv= ers/net/e1000e/e1000.h ---- linux-2.6.38.3/drivers/net/e1000e/e1000.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/net/e1000e/e1000.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/e1000e/e1000.h linux-2.6.38.4/driv= ers/net/e1000e/e1000.h +--- linux-2.6.38.4/drivers/net/e1000e/e1000.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/net/e1000e/e1000.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -408,9 +408,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -27084,9 +26541,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/e100= 0.h linux-2.6.38.3/drivers/net/ }; =20 /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.38.3/drivers/net/e1000e/es2lan.c linux-2.6.38.3/dri= vers/net/e1000e/es2lan.c ---- linux-2.6.38.3/drivers/net/e1000e/es2lan.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/net/e1000e/es2lan.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/e1000e/es2lan.c linux-2.6.38.4/dri= vers/net/e1000e/es2lan.c +--- linux-2.6.38.4/drivers/net/e1000e/es2lan.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/net/e1000e/es2lan.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw =3D &adapter->hw; @@ -27123,9 +26580,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/es2l= an.c linux-2.6.38.3/drivers/net .acquire =3D e1000_acquire_nvm_80003es2lan, .read =3D e1000e_read_nvm_eerd, .release =3D e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.38.3/drivers/net/e1000e/hw.h linux-2.6.38.3/drivers= /net/e1000e/hw.h ---- linux-2.6.38.3/drivers/net/e1000e/hw.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/net/e1000e/hw.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/net/e1000e/hw.h linux-2.6.38.4/drivers= /net/e1000e/hw.h +--- linux-2.6.38.4/drivers/net/e1000e/hw.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/net/e1000e/hw.h 2011-04-17 15:57:32.000000000= -0400 @@ -801,16 +801,17 @@ struct e1000_phy_operations { =20 /* Function pointers for the NVM. */ @@ -27167,9 +26624,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/hw.h= linux-2.6.38.3/drivers/net/e10 struct e1000_nvm_operations ops; =20 enum e1000_nvm_type type; -diff -urNp linux-2.6.38.3/drivers/net/e1000e/ich8lan.c linux-2.6.38.3/dr= ivers/net/e1000e/ich8lan.c ---- linux-2.6.38.3/drivers/net/e1000e/ich8lan.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/net/e1000e/ich8lan.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/e1000e/ich8lan.c linux-2.6.38.4/dr= ivers/net/e1000e/ich8lan.c +--- linux-2.6.38.4/drivers/net/e1000e/ich8lan.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/net/e1000e/ich8lan.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -3840,7 +3840,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -27197,9 +26654,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/ich8= lan.c linux-2.6.38.3/drivers/ne .acquire =3D e1000_acquire_nvm_ich8lan, .read =3D e1000_read_nvm_ich8lan, .release =3D e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.38.3/drivers/net/igb/e1000_82575.c linux-2.6.38.3/d= rivers/net/igb/e1000_82575.c ---- linux-2.6.38.3/drivers/net/igb/e1000_82575.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/net/igb/e1000_82575.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_82575.c linux-2.6.38.4/d= rivers/net/igb/e1000_82575.c +--- linux-2.6.38.4/drivers/net/igb/e1000_82575.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/net/igb/e1000_82575.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -1747,7 +1747,7 @@ u16 igb_rxpbs_adjust_82580(u32 data) return ret_val; } @@ -27225,9 +26682,9 @@ diff -urNp linux-2.6.38.3/drivers/net/igb/e1000_8= 2575.c linux-2.6.38.3/drivers/n .acquire =3D igb_acquire_nvm_82575, .read =3D igb_read_nvm_eerd, .release =3D igb_release_nvm_82575, -diff -urNp linux-2.6.38.3/drivers/net/igb/e1000_hw.h linux-2.6.38.3/driv= ers/net/igb/e1000_hw.h ---- linux-2.6.38.3/drivers/net/igb/e1000_hw.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/net/igb/e1000_hw.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_hw.h linux-2.6.38.4/driv= ers/net/igb/e1000_hw.h +--- linux-2.6.38.4/drivers/net/igb/e1000_hw.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/net/igb/e1000_hw.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -327,22 +327,23 @@ struct e1000_phy_operations { }; =20 @@ -27275,9 +26732,9 @@ diff -urNp linux-2.6.38.3/drivers/net/igb/e1000_h= w.h linux-2.6.38.3/drivers/net/ struct e1000_nvm_operations ops; =20 enum e1000_nvm_type type; -diff -urNp linux-2.6.38.3/drivers/net/igbvf/vf.h linux-2.6.38.3/drivers/= net/igbvf/vf.h ---- linux-2.6.38.3/drivers/net/igbvf/vf.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/net/igbvf/vf.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/net/igbvf/vf.h linux-2.6.38.4/drivers/= net/igbvf/vf.h +--- linux-2.6.38.4/drivers/net/igbvf/vf.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/net/igbvf/vf.h 2011-04-17 15:57:32.000000000 = -0400 @@ -191,6 +191,7 @@ struct e1000_mac_operations { }; =20 @@ -27286,28 +26743,9 @@ diff -urNp linux-2.6.38.3/drivers/net/igbvf/vf.h= linux-2.6.38.3/drivers/net/igbv struct e1000_mac_operations ops; u8 addr[6]; u8 perm_addr[6]; -diff -urNp linux-2.6.38.3/drivers/net/irda/vlsi_ir.c linux-2.6.38.3/driv= ers/net/irda/vlsi_ir.c ---- linux-2.6.38.3/drivers/net/irda/vlsi_ir.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/net/irda/vlsi_ir.c 2011-04-17 15:57:32.000000= 000 -0400 -@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( - /* no race - tx-ring already empty */ - vlsi_set_baud(idev, iobase); - netif_wake_queue(ndev); -- } -- else -- ; -+ } else { - /* keep the speed change pending like it would - * for any len>0 packet. tx completion interrupt - * will apply it when the tx ring becomes empty. - */ -+ } - spin_unlock_irqrestore(&idev->lock, flags); - dev_kfree_skb_any(skb); - return NETDEV_TX_OK; -diff -urNp linux-2.6.38.3/drivers/net/pcnet32.c linux-2.6.38.3/drivers/n= et/pcnet32.c ---- linux-2.6.38.3/drivers/net/pcnet32.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/net/pcnet32.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/net/pcnet32.c linux-2.6.38.4/drivers/n= et/pcnet32.c +--- linux-2.6.38.4/drivers/net/pcnet32.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/net/pcnet32.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -82,7 +82,7 @@ static int cards_found; /* * VLB I/O addresses @@ -27317,9 +26755,9 @@ diff -urNp linux-2.6.38.3/drivers/net/pcnet32.c l= inux-2.6.38.3/drivers/net/pcnet { 0x300, 0x320, 0x340, 0x360, 0 }; =20 static int pcnet32_debug; -diff -urNp linux-2.6.38.3/drivers/net/ppp_generic.c linux-2.6.38.3/drive= rs/net/ppp_generic.c ---- linux-2.6.38.3/drivers/net/ppp_generic.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/net/ppp_generic.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/net/ppp_generic.c linux-2.6.38.4/drive= rs/net/ppp_generic.c +--- linux-2.6.38.4/drivers/net/ppp_generic.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/net/ppp_generic.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st void __user *addr =3D (void __user *) ifr->ifr_ifru.ifru_data; struct ppp_stats stats; @@ -27338,9 +26776,9 @@ diff -urNp linux-2.6.38.3/drivers/net/ppp_generic= .c linux-2.6.38.3/drivers/net/p break; err =3D 0; break; -diff -urNp linux-2.6.38.3/drivers/net/tg3.h linux-2.6.38.3/drivers/net/t= g3.h ---- linux-2.6.38.3/drivers/net/tg3.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/net/tg3.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/tg3.h linux-2.6.38.4/drivers/net/t= g3.h +--- linux-2.6.38.4/drivers/net/tg3.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/net/tg3.h 2011-04-17 15:57:32.000000000 -0400 @@ -131,6 +131,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -27349,9 +26787,9 @@ diff -urNp linux-2.6.38.3/drivers/net/tg3.h linux= -2.6.38.3/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.38.3/drivers/net/tulip/de4x5.c linux-2.6.38.3/drive= rs/net/tulip/de4x5.c ---- linux-2.6.38.3/drivers/net/tulip/de4x5.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/net/tulip/de4x5.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/net/tulip/de4x5.c linux-2.6.38.4/drive= rs/net/tulip/de4x5.c +--- linux-2.6.38.4/drivers/net/tulip/de4x5.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/net/tulip/de4x5.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=3D0; idev_addr[i]; @@ -27370,9 +26808,9 @@ diff -urNp linux-2.6.38.3/drivers/net/tulip/de4x5= .c linux-2.6.38.3/drivers/net/t return -EFAULT; break; } -diff -urNp linux-2.6.38.3/drivers/net/usb/hso.c linux-2.6.38.3/drivers/n= et/usb/hso.c ---- linux-2.6.38.3/drivers/net/usb/hso.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/net/usb/hso.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/net/usb/hso.c linux-2.6.38.4/drivers/n= et/usb/hso.c +--- linux-2.6.38.4/drivers/net/usb/hso.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/net/usb/hso.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -71,7 +71,7 @@ #include #include @@ -27469,9 +26907,9 @@ diff -urNp linux-2.6.38.3/drivers/net/usb/hso.c l= inux-2.6.38.3/drivers/net/usb/h result =3D hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.= 6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c ---- linux-2.6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-18 17:2= 7:18.000000000 -0400 -+++ linux-2.6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-17 16:5= 3:41.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.= 6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c +--- linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-18 17:2= 7:18.000000000 -0400 ++++ linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-17 16:5= 3:41.000000000 -0400 @@ -628,8 +628,7 @@ vmxnet3_set_rss_indir(struct net_device=20 * Return with error code if any of the queue indices * is out of range @@ -27482,9 +26920,9 @@ diff -urNp linux-2.6.38.3/drivers/net/vmxnet3/vmx= net3_ethtool.c linux-2.6.38.3/d return -EINVAL; } =20 -diff -urNp linux-2.6.38.3/drivers/net/wireless/b43/debugfs.c linux-2.6.3= 8.3/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.38.3/drivers/net/wireless/b43/debugfs.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c linux-2.6.3= 8.4/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:57:3= 2.000000000 -0400 @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); @@ -27494,9 +26932,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/b4= 3/debugfs.c linux-2.6.38.3/driv /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c linux= -2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c 2011-03-14 2= 1:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 1= 5:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c linux= -2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c 2011-03-14 2= 1:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 1= 5:57:32.000000000 -0400 @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize= ); @@ -27506,9 +26944,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/b4= 3legacy/debugfs.c linux-2.6.38. /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ -diff -urNp linux-2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux= -2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-14 2= 1:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 1= 5:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux= -2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-14 2= 1:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 1= 5:57:32.000000000 -0400 @@ -68,8 +68,8 @@ do { =20 } while (0) =20 @@ -27520,9 +26958,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/iw= lwifi/iwl-debug.h linux-2.6.38. static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, const void *p, u32 len) {} -diff -urNp linux-2.6.38.3/drivers/net/wireless/libertas/debugfs.c linux-= 2.6.38.3/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.38.3/drivers/net/wireless/libertas/debugfs.c 2011-03-14 21= :20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/net/wireless/libertas/debugfs.c 2011-04-17 15= :57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c linux-= 2.6.38.4/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c 2011-03-14 21= :20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c 2011-04-17 15= :57:32.000000000 -0400 @@ -702,7 +702,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -27532,9 +26970,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/li= bertas/debugfs.c linux-2.6.38.3 }; =20 static const struct lbs_debugfs_files debugfs_files[] =3D { -diff -urNp linux-2.6.38.3/drivers/net/wireless/rndis_wlan.c linux-2.6.38= .3/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.38.3/drivers/net/wireless/rndis_wlan.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c linux-2.6.38= .4/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:57:32= .000000000 -0400 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn =20 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold); @@ -27544,9 +26982,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/rn= dis_wlan.c linux-2.6.38.3/drive rts_threshold =3D 2347; =20 tmp =3D cpu_to_le32(rts_threshold); -diff -urNp linux-2.6.38.3/drivers/oprofile/buffer_sync.c linux-2.6.38.3/= drivers/oprofile/buffer_sync.c ---- linux-2.6.38.3/drivers/oprofile/buffer_sync.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/oprofile/buffer_sync.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/drivers/oprofile/buffer_sync.c linux-2.6.38.4/= drivers/oprofile/buffer_sync.c +--- linux-2.6.38.4/drivers/oprofile/buffer_sync.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/drivers/oprofile/buffer_sync.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -342,7 +342,7 @@ static void add_data(struct op_entry *en if (cookie =3D=3D NO_COOKIE) offset =3D pc; @@ -27582,9 +27020,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/buffer= _sync.c linux-2.6.38.3/drivers/ } } release_mm(mm); -diff -urNp linux-2.6.38.3/drivers/oprofile/event_buffer.c linux-2.6.38.3= /drivers/oprofile/event_buffer.c ---- linux-2.6.38.3/drivers/oprofile/event_buffer.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/oprofile/event_buffer.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/oprofile/event_buffer.c linux-2.6.38.4= /drivers/oprofile/event_buffer.c +--- linux-2.6.38.4/drivers/oprofile/event_buffer.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/oprofile/event_buffer.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } =20 @@ -27594,9 +27032,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/event_= buffer.c linux-2.6.38.3/drivers return; } =20 -diff -urNp linux-2.6.38.3/drivers/oprofile/oprof.c linux-2.6.38.3/driver= s/oprofile/oprof.c ---- linux-2.6.38.3/drivers/oprofile/oprof.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/oprofile/oprof.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/oprofile/oprof.c linux-2.6.38.4/driver= s/oprofile/oprof.c +--- linux-2.6.38.4/drivers/oprofile/oprof.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/oprofile/oprof.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -27606,9 +27044,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/oprof.= c linux-2.6.38.3/drivers/oprofi start_switch_worker(); } =20 -diff -urNp linux-2.6.38.3/drivers/oprofile/oprofilefs.c linux-2.6.38.3/d= rivers/oprofile/oprofilefs.c ---- linux-2.6.38.3/drivers/oprofile/oprofilefs.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/oprofile/oprofilefs.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/oprofile/oprofilefs.c linux-2.6.38.4/d= rivers/oprofile/oprofilefs.c +--- linux-2.6.38.4/drivers/oprofile/oprofilefs.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/oprofile/oprofilefs.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -186,7 +186,7 @@ static const struct file_operations atom =20 =20 @@ -27618,9 +27056,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/oprofi= lefs.c linux-2.6.38.3/drivers/o { return __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444, val); -diff -urNp linux-2.6.38.3/drivers/oprofile/oprofile_stats.c linux-2.6.38= .3/drivers/oprofile/oprofile_stats.c ---- linux-2.6.38.3/drivers/oprofile/oprofile_stats.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/oprofile/oprofile_stats.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.c linux-2.6.38= .4/drivers/oprofile/oprofile_stats.c +--- linux-2.6.38.4/drivers/oprofile/oprofile_stats.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/oprofile/oprofile_stats.c 2011-04-17 15:57:32= .000000000 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip =3D 0; } @@ -27638,9 +27076,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/oprofi= le_stats.c linux-2.6.38.3/drive } =20 =20 -diff -urNp linux-2.6.38.3/drivers/oprofile/oprofile_stats.h linux-2.6.38= .3/drivers/oprofile/oprofile_stats.h ---- linux-2.6.38.3/drivers/oprofile/oprofile_stats.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/oprofile/oprofile_stats.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.h linux-2.6.38= .4/drivers/oprofile/oprofile_stats.h +--- linux-2.6.38.4/drivers/oprofile/oprofile_stats.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/oprofile/oprofile_stats.h 2011-04-17 15:57:32= .000000000 -0400 @@ -13,11 +13,11 @@ #include =20 @@ -27658,9 +27096,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/oprofi= le_stats.h linux-2.6.38.3/drive }; =20 extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.38.3/drivers/parport/procfs.c linux-2.6.38.3/driver= s/parport/procfs.c ---- linux-2.6.38.3/drivers/parport/procfs.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/parport/procfs.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/parport/procfs.c linux-2.6.38.4/driver= s/parport/procfs.c +--- linux-2.6.38.4/drivers/parport/procfs.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/parport/procfs.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t =20 *ppos +=3D len; @@ -27679,9 +27117,9 @@ diff -urNp linux-2.6.38.3/drivers/parport/procfs.= c linux-2.6.38.3/drivers/parpor } #endif /* IEEE1284.3 support. */ =20 -diff -urNp linux-2.6.38.3/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.3= 8.3/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.38.3/drivers/pci/hotplug/acpiphp_glue.c 2011-04-18 17:27:1= 6.000000000 -0400 -+++ linux-2.6.38.3/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.3= 8.4/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c 2011-04-18 17:27:1= 6.000000000 -0400 ++++ linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:57:3= 2.000000000 -0400 @@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif } =20 @@ -27691,9 +27129,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/hotplug/acp= iphp_glue.c linux-2.6.38.3/driv .handler =3D handle_hotplug_event_func, }; =20 -diff -urNp linux-2.6.38.3/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.3= 8.3/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.38.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.3= 8.4/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:57:3= 2.000000000 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ =20 void compaq_nvram_init (void __iomem *rom_start) @@ -27708,9 +27146,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/hotplug/cpq= php_nvram.c linux-2.6.38.3/driv dbg("int15 entry =3D %p\n", compaq_int15_entry_point); =20 /* initialize our int15 lock */ -diff -urNp linux-2.6.38.3/drivers/pci/intel-iommu.c linux-2.6.38.3/drive= rs/pci/intel-iommu.c ---- linux-2.6.38.3/drivers/pci/intel-iommu.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/pci/intel-iommu.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/pci/intel-iommu.c linux-2.6.38.4/drive= rs/pci/intel-iommu.c +--- linux-2.6.38.4/drivers/pci/intel-iommu.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/pci/intel-iommu.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de return !dma_addr; } @@ -27720,9 +27158,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/intel-iommu= .c linux-2.6.38.3/drivers/pci/i .alloc_coherent =3D intel_alloc_coherent, .free_coherent =3D intel_free_coherent, .map_sg =3D intel_map_sg, -diff -urNp linux-2.6.38.3/drivers/pci/pcie/aspm.c linux-2.6.38.3/drivers= /pci/pcie/aspm.c ---- linux-2.6.38.3/drivers/pci/pcie/aspm.c 2011-04-18 17:27:18.000000000= -0400 -+++ linux-2.6.38.3/drivers/pci/pcie/aspm.c 2011-04-17 16:53:41.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/pci/pcie/aspm.c linux-2.6.38.4/drivers= /pci/pcie/aspm.c +--- linux-2.6.38.4/drivers/pci/pcie/aspm.c 2011-04-18 17:27:18.000000000= -0400 ++++ linux-2.6.38.4/drivers/pci/pcie/aspm.c 2011-04-17 16:53:41.000000000= -0400 @@ -27,9 +27,9 @@ #define MODULE_PARAM_PREFIX "pcie_aspm." =20 @@ -27736,21 +27174,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/pcie/aspm.= c linux-2.6.38.3/drivers/pci/pci #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) =20 -diff -urNp linux-2.6.38.3/drivers/pci/pcie/portdrv_pci.c linux-2.6.38.3/= drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.38.3/drivers/pci/pcie/portdrv_pci.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/pci/pcie/portdrv_pci.c 2011-04-17 15:57:32.00= 0000000 -0400 -@@ -307,7 +307,7 @@ static void pcie_portdrv_err_resume(stru - static const struct pci_device_id port_pci_ids[] =3D { { - /* handle any PCI-Express port */ - PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0), -- }, { /* end: all zeroes */ } -+ }, { 0, 0, 0, 0, 0, 0, 0 } - }; - MODULE_DEVICE_TABLE(pci, port_pci_ids); -=20 -diff -urNp linux-2.6.38.3/drivers/pci/probe.c linux-2.6.38.3/drivers/pci= /probe.c ---- linux-2.6.38.3/drivers/pci/probe.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/pci/probe.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/pci/probe.c linux-2.6.38.4/drivers/pci= /probe.c +--- linux-2.6.38.4/drivers/pci/probe.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/pci/probe.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( return ret; } @@ -27777,9 +27203,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/probe.c lin= ux-2.6.38.3/drivers/pci/probe.c =20 if (!dev->mmio_always_on) { pci_read_config_word(dev, PCI_COMMAND, &orig_cmd); -diff -urNp linux-2.6.38.3/drivers/pci/proc.c linux-2.6.38.3/drivers/pci/= proc.c ---- linux-2.6.38.3/drivers/pci/proc.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/drivers/pci/proc.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/drivers/pci/proc.c linux-2.6.38.4/drivers/pci/= proc.c +--- linux-2.6.38.4/drivers/pci/proc.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/drivers/pci/proc.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -476,7 +476,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -27797,33 +27223,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/proc.c lin= ux-2.6.38.3/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized =3D 1; -diff -urNp linux-2.6.38.3/drivers/pcmcia/ti113x.h linux-2.6.38.3/drivers= /pcmcia/ti113x.h ---- linux-2.6.38.3/drivers/pcmcia/ti113x.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/pcmcia/ti113x.h 2011-04-17 15:57:32.000000000= -0400 -@@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl - DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, - ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), -=20 -- {} -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus = *bus) -diff -urNp linux-2.6.38.3/drivers/pcmcia/yenta_socket.c linux-2.6.38.3/d= rivers/pcmcia/yenta_socket.c ---- linux-2.6.38.3/drivers/pcmcia/yenta_socket.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/pcmcia/yenta_socket.c 2011-04-17 15:57:32.000= 000000 -0400 -@@ -1426,7 +1426,7 @@ static struct pci_device_id yenta_table[ -=20 - /* match any cardbus bridge */ - CB_ID(PCI_ANY_ID, PCI_ANY_ID, DEFAULT), -- { /* all zeroes */ } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; - MODULE_DEVICE_TABLE(pci, yenta_table); -=20 -diff -urNp linux-2.6.38.3/drivers/platform/x86/asus-laptop.c linux-2.6.3= 8.3/drivers/platform/x86/asus-laptop.c ---- linux-2.6.38.3/drivers/platform/x86/asus-laptop.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/drivers/platform/x86/asus-laptop.c 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/platform/x86/asus-laptop.c linux-2.6.3= 8.4/drivers/platform/x86/asus-laptop.c +--- linux-2.6.38.4/drivers/platform/x86/asus-laptop.c 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/drivers/platform/x86/asus-laptop.c 2011-04-17 15:57:3= 2.000000000 -0400 @@ -243,7 +243,6 @@ struct asus_laptop { struct asus_led gled; struct asus_led kled; @@ -27832,9 +27234,9 @@ diff -urNp linux-2.6.38.3/drivers/platform/x86/as= us-laptop.c linux-2.6.38.3/driv int wireless_status; bool have_rsts; int lcd_state; -diff -urNp linux-2.6.38.3/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.3= /drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.38.3/drivers/pnp/pnpbios/bioscalls.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.4= /drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -59,7 +59,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -27891,21 +27293,9 @@ diff -urNp linux-2.6.38.3/drivers/pnp/pnpbios/bi= oscalls.c linux-2.6.38.3/drivers + + pax_close_kernel(); } -diff -urNp linux-2.6.38.3/drivers/pnp/quirks.c linux-2.6.38.3/drivers/pn= p/quirks.c ---- linux-2.6.38.3/drivers/pnp/quirks.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/drivers/pnp/quirks.c 2011-04-17 15:57:32.000000000 -0= 400 -@@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] =3D { - /* PnP resources that might overlap PCI BARs */ - {"PNP0c01", quirk_system_pci_resources}, - {"PNP0c02", quirk_system_pci_resources}, -- {""} -+ {"", NULL} - }; -=20 - void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.38.3/drivers/pnp/resource.c linux-2.6.38.3/drivers/= pnp/resource.c ---- linux-2.6.38.3/drivers/pnp/resource.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/pnp/resource.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/pnp/resource.c linux-2.6.38.4/drivers/= pnp/resource.c +--- linux-2.6.38.4/drivers/pnp/resource.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/pnp/resource.c 2011-04-17 15:57:32.000000000 = -0400 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; =20 @@ -27924,9 +27314,9 @@ diff -urNp linux-2.6.38.3/drivers/pnp/resource.c = linux-2.6.38.3/drivers/pnp/reso return 0; =20 /* check if the resource is reserved */ -diff -urNp linux-2.6.38.3/drivers/rtc/rtc-dev.c linux-2.6.38.3/drivers/r= tc/rtc-dev.c ---- linux-2.6.38.3/drivers/rtc/rtc-dev.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/rtc/rtc-dev.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/rtc/rtc-dev.c linux-2.6.38.4/drivers/r= tc/rtc-dev.c +--- linux-2.6.38.4/drivers/rtc/rtc-dev.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/rtc/rtc-dev.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -14,6 +14,7 @@ #include #include @@ -27944,9 +27334,9 @@ diff -urNp linux-2.6.38.3/drivers/rtc/rtc-dev.c l= inux-2.6.38.3/drivers/rtc/rtc-d return rtc_set_time(rtc, &tm); =20 case RTC_PIE_ON: -diff -urNp linux-2.6.38.3/drivers/s390/cio/qdio_debug.c linux-2.6.38.3/d= rivers/s390/cio/qdio_debug.c ---- linux-2.6.38.3/drivers/s390/cio/qdio_debug.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/s390/cio/qdio_debug.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/s390/cio/qdio_debug.c linux-2.6.38.4/d= rivers/s390/cio/qdio_debug.c +--- linux-2.6.38.4/drivers/s390/cio/qdio_debug.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/s390/cio/qdio_debug.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode * filp->f_path.dentry->d_inode->i_private); } @@ -27956,9 +27346,9 @@ diff -urNp linux-2.6.38.3/drivers/s390/cio/qdio_d= ebug.c linux-2.6.38.3/drivers/s .owner =3D THIS_MODULE, .open =3D qperf_seq_open, .read =3D seq_read, -diff -urNp linux-2.6.38.3/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.= 38.3/drivers/scsi/aic94xx/aic94xx_init.c ---- linux-2.6.38.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.= 38.4/drivers/scsi/aic94xx/aic94xx_init.c +--- linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:57:= 32.000000000 -0400 @@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru flash_error_table[i].reason); } @@ -27968,9 +27358,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/aic94xx/ai= c94xx_init.c linux-2.6.38.3/dri asd_show_update_bios, asd_store_update_bios); =20 static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) -diff -urNp linux-2.6.38.3/drivers/scsi/hpsa.c linux-2.6.38.3/drivers/scs= i/hpsa.c ---- linux-2.6.38.3/drivers/scsi/hpsa.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/scsi/hpsa.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/scsi/hpsa.c linux-2.6.38.4/drivers/scs= i/hpsa.c +--- linux-2.6.38.4/drivers/scsi/hpsa.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/scsi/hpsa.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -2281,6 +2281,8 @@ static int hpsa_ioctl32_passthru(struct=20 int err; u32 cp; @@ -27980,9 +27370,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/hpsa.c lin= ux-2.6.38.3/drivers/scsi/hpsa.c err =3D 0; err |=3D copy_from_user(&arg64.LUN_info, &arg32->LUN_info, sizeof(arg64.LUN_info)); -diff -urNp linux-2.6.38.3/drivers/scsi/ipr.c linux-2.6.38.3/drivers/scsi= /ipr.c ---- linux-2.6.38.3/drivers/scsi/ipr.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/drivers/scsi/ipr.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/drivers/scsi/ipr.c linux-2.6.38.4/drivers/scsi= /ipr.c +--- linux-2.6.38.4/drivers/scsi/ipr.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/drivers/scsi/ipr.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -6207,7 +6207,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -27992,9 +27382,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/ipr.c linu= x-2.6.38.3/drivers/scsi/ipr.c .phy_reset =3D ipr_ata_phy_reset, .hardreset =3D ipr_sata_reset, .post_internal_cmd =3D ipr_ata_post_internal, -diff -urNp linux-2.6.38.3/drivers/scsi/libfc/fc_exch.c linux-2.6.38.3/dr= ivers/scsi/libfc/fc_exch.c ---- linux-2.6.38.3/drivers/scsi/libfc/fc_exch.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/drivers/scsi/libfc/fc_exch.c 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c linux-2.6.38.4/dr= ivers/scsi/libfc/fc_exch.c +--- linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c 2011-04-17 15:57:32.0000= 00000 -0400 @@ -105,12 +105,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -28116,10 +27506,10 @@ diff -urNp linux-2.6.38.3/drivers/scsi/libfc/fc= _exch.c linux-2.6.38.3/drivers/sc =20 fc_frame_free(fp); } -diff -urNp linux-2.6.38.3/drivers/scsi/libsas/sas_ata.c linux-2.6.38.3/d= rivers/scsi/libsas/sas_ata.c ---- linux-2.6.38.3/drivers/scsi/libsas/sas_ata.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/scsi/libsas/sas_ata.c 2011-04-17 15:57:32.000= 000000 -0400 -@@ -348,10 +348,10 @@ static int sas_ata_scr_read(struct ata_l +diff -urNp linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c linux-2.6.38.4/d= rivers/scsi/libsas/sas_ata.c +--- linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c 2011-04-23 12:47:28.000= 000000 -0400 +@@ -348,7 +348,7 @@ static int sas_ata_scr_read(struct ata_l } } =20 @@ -28127,26 +27517,10 @@ diff -urNp linux-2.6.38.3/drivers/scsi/libsas/s= as_ata.c linux-2.6.38.3/drivers/s +static const struct ata_port_operations sas_sata_ops =3D { .phy_reset =3D sas_ata_phy_reset, .post_internal_cmd =3D sas_ata_post_internal, -- .qc_defer =3D ata_std_qc_defer, -+ .qc_defer =3D ata_std_qc_defer, - .qc_prep =3D ata_noop_qc_prep, - .qc_issue =3D sas_ata_qc_issue, - .qc_fill_rtf =3D sas_ata_qc_fill_rtf, -diff -urNp linux-2.6.38.3/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6= .38.3/drivers/scsi/mpt2sas/mpt2sas_debug.h ---- linux-2.6.38.3/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-04-17 15:57= :32.000000000 -0400 -@@ -79,7 +79,7 @@ - CMD; \ - } - #else --#define MPT_CHECK_LOGGING(IOC, CMD, BITS) -+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) - #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ -=20 -=20 -diff -urNp linux-2.6.38.3/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.3/d= rivers/scsi/qla2xxx/qla_os.c ---- linux-2.6.38.3/drivers/scsi/qla2xxx/qla_os.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/scsi/qla2xxx/qla_os.c 2011-04-17 15:57:32.000= 000000 -0400 + .qc_defer =3D ata_std_qc_defer, +diff -urNp linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.4/d= rivers/scsi/qla2xxx/qla_os.c +--- linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -4096,7 +4096,7 @@ static struct pci_driver qla2xxx_pci_dri .err_handler =3D &qla2xxx_err_handler, }; @@ -28156,21 +27530,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/qla2xxx/q= la_os.c linux-2.6.38.3/drivers/s .owner =3D THIS_MODULE, .llseek =3D noop_llseek, }; -diff -urNp linux-2.6.38.3/drivers/scsi/scsi_logging.h linux-2.6.38.3/dri= vers/scsi/scsi_logging.h ---- linux-2.6.38.3/drivers/scsi/scsi_logging.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/scsi/scsi_logging.h 2011-04-17 15:57:32.00000= 0000 -0400 -@@ -51,7 +51,7 @@ do { \ - } while (0); \ - } while (0) - #else --#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) -+#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) do {} while (0) - #endif /* CONFIG_SCSI_LOGGING */ -=20 - /* -diff -urNp linux-2.6.38.3/drivers/scsi/scsi_transport_fc.c linux-2.6.38.= 3/drivers/scsi/scsi_transport_fc.c ---- linux-2.6.38.3/drivers/scsi/scsi_transport_fc.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/scsi/scsi_transport_fc.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c linux-2.6.38.= 4/drivers/scsi/scsi_transport_fc.c +--- linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -836,7 +836,7 @@ static int fc_str_to_dev_loss(const char char *cp; =20 @@ -28180,9 +27542,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/scsi_trans= port_fc.c linux-2.6.38.3/driver return -EINVAL; /* * Check for overflow; dev_loss_tmo is u32 -diff -urNp linux-2.6.38.3/drivers/scsi/sg.c linux-2.6.38.3/drivers/scsi/= sg.c ---- linux-2.6.38.3/drivers/scsi/sg.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/scsi/sg.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/scsi/sg.c linux-2.6.38.4/drivers/scsi/= sg.c +--- linux-2.6.38.4/drivers/scsi/sg.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/scsi/sg.c 2011-04-17 15:57:32.000000000 -0400 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -28201,9 +27563,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/sg.c linux= -2.6.38.3/drivers/scsi/sg.c =20 sg_proc_sgp =3D proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.38.3/drivers/staging/autofs/root.c linux-2.6.38.3/d= rivers/staging/autofs/root.c ---- linux-2.6.38.3/drivers/staging/autofs/root.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/staging/autofs/root.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/autofs/root.c linux-2.6.38.4/d= rivers/staging/autofs/root.c +--- linux-2.6.38.4/drivers/staging/autofs/root.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/staging/autofs/root.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -311,7 +311,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl =3D &sbi->symlink[n]; @@ -28214,9 +27576,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/autofs/= root.c linux-2.6.38.3/drivers/s if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.38.3/drivers/staging/bcm/Bcmchar.c linux-2.6.38.3/d= rivers/staging/bcm/Bcmchar.c ---- linux-2.6.38.3/drivers/staging/bcm/Bcmchar.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/staging/bcm/Bcmchar.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c linux-2.6.38.4/d= rivers/staging/bcm/Bcmchar.c +--- linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -2093,7 +2093,7 @@ static long bcm_char_ioctl(struct file * } =20 @@ -28226,9 +27588,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/bcm/Bcm= char.c linux-2.6.38.3/drivers/s .owner =3D THIS_MODULE, .open =3D bcm_char_open, .release =3D bcm_char_release, -diff -urNp linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c= linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c ---- linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-0= 3-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-0= 4-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c= linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +--- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-0= 3-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-0= 4-17 15:57:32.000000000 -0400 @@ -863,14 +863,14 @@ static void dhd_op_if(dhd_if_t *ifp) free_netdev(ifp->net); } @@ -28284,9 +27646,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/brcm802= 11/brcmfmac/dhd_linux.c linux-2 =20 #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC) g_bus =3D bus; -diff -urNp linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c lin= ux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c ---- linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-14= 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-04-17= 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c lin= ux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c +--- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-14= 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-04-17= 15:57:32.000000000 -0400 @@ -513,7 +513,7 @@ wl_iw_get_range(struct net_device *dev, list =3D (wl_u32_list_t *) channels; =20 @@ -28296,9 +27658,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/brcm802= 11/brcmfmac/wl_iw.c linux-2.6.3 =20 range->min_nwid =3D range->max_nwid =3D 0; =20 -diff -urNp linux-2.6.38.3/drivers/staging/comedi/comedi_fops.c linux-2.6= .38.3/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.38.3/drivers/staging/comedi/comedi_fops.c 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/comedi/comedi_fops.c 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c linux-2.6= .38.4/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c 2011-04-17 15:57= :32.000000000 -0400 @@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_ mutex_unlock(&dev->mutex); } @@ -28308,9 +27670,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/comedi/= comedi_fops.c linux-2.6.38.3/dr .close =3D comedi_unmap, }; =20 -diff -urNp linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug= .c linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c ---- linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011= -03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011= -04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug= .c linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +--- linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011= -03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011= -04-17 15:57:32.000000000 -0400 @@ -55,7 +55,7 @@ int numofmsgbuf =3D 0; // // Table of entry-point routines for char device @@ -28320,9 +27682,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/ft1000/= ft1000-usb/ft1000_debug.c linux { .unlocked_ioctl =3D ft1000_ioctl, .poll =3D ft1000_poll_dev, -diff -urNp linux-2.6.38.3/drivers/staging/go7007/go7007-v4l2.c linux-2.6= .38.3/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.38.3/drivers/staging/go7007/go7007-v4l2.c 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:57= :32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6= .38.4/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:57= :32.000000000 -0400 @@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -28332,9 +27694,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/go7007/= go7007-v4l2.c linux-2.6.38.3/dr .open =3D go7007_vm_open, .close =3D go7007_vm_close, .fault =3D go7007_vm_fault, -diff -urNp linux-2.6.38.3/drivers/staging/hv/hv.c linux-2.6.38.3/drivers= /staging/hv/hv.c ---- linux-2.6.38.3/drivers/staging/hv/hv.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/staging/hv/hv.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/staging/hv/hv.c linux-2.6.38.4/drivers= /staging/hv/hv.c +--- linux-2.6.38.4/drivers/staging/hv/hv.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/staging/hv/hv.c 2011-04-17 15:57:32.000000000= -0400 @@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, voi u64 output_address =3D (output) ? virt_to_phys(output) : 0; u32 output_address_hi =3D output_address >> 32; @@ -28344,9 +27706,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/hv/hv.c= linux-2.6.38.3/drivers/staging =20 DPRINT_DBG(VMBUS, "Hypercall ", control, input, output); -diff -urNp linux-2.6.38.3/drivers/staging/phison/phison.c linux-2.6.38.3= /drivers/staging/phison/phison.c ---- linux-2.6.38.3/drivers/staging/phison/phison.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/staging/phison/phison.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/phison/phison.c linux-2.6.38.4= /drivers/staging/phison/phison.c +--- linux-2.6.38.4/drivers/staging/phison/phison.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/staging/phison/phison.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -28356,9 +27718,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/phison/= phison.c linux-2.6.38.3/drivers .inherits =3D &ata_bmdma_port_ops, .prereset =3D phison_pre_reset, }; -diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/inode.c linux-2.6.38.= 3/drivers/staging/pohmelfs/inode.c ---- linux-2.6.38.3/drivers/staging/pohmelfs/inode.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/pohmelfs/inode.c 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/inode.c linux-2.6.38.= 4/drivers/staging/pohmelfs/inode.c +--- linux-2.6.38.4/drivers/staging/pohmelfs/inode.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/pohmelfs/inode.c 2011-04-17 15:57:32.= 000000000 -0400 @@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root =3D RB_ROOT; @@ -28368,9 +27730,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/pohmelf= s/inode.c linux-2.6.38.3/driver =20 psb->trans_max_pages =3D 100; =20 -diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/mcache.c linux-2.6.38= .3/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.38.3/drivers/staging/pohmelfs/mcache.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c linux-2.6.38= .4/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:57:32= .000000000 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data =3D data; m->start =3D start; @@ -28380,9 +27742,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/pohmelf= s/mcache.c linux-2.6.38.3/drive =20 mutex_lock(&psb->mcache_lock); err =3D pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/netfs.h linux-2.6.38.= 3/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.38.3/drivers/staging/pohmelfs/netfs.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/pohmelfs/netfs.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h linux-2.6.38.= 4/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -571,7 +571,7 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -28392,9 +27754,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/pohmelf= s/netfs.h linux-2.6.38.3/driver unsigned long mcache_timeout; =20 unsigned int idx; -diff -urNp linux-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c linu= x-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c ---- linux-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-14 = 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c 2011-04-17 = 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c linu= x-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c +--- linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-14 = 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-04-17 = 15:57:32.000000000 -0400 @@ -99,7 +99,7 @@ static int crypto_info_open(struct inode return seq_open(file, &crypto_seq_ops); } @@ -28404,9 +27766,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/rtl8192= u/ieee80211/proc.c linux-2.6.38 .open =3D crypto_info_open, .read =3D seq_read, .llseek =3D seq_lseek, -diff -urNp linux-2.6.38.3/drivers/staging/spectra/ffsport.c linux-2.6.38= .3/drivers/staging/spectra/ffsport.c ---- linux-2.6.38.3/drivers/staging/spectra/ffsport.c 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/spectra/ffsport.c 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/spectra/ffsport.c linux-2.6.38= .4/drivers/staging/spectra/ffsport.c +--- linux-2.6.38.4/drivers/staging/spectra/ffsport.c 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/spectra/ffsport.c 2011-04-17 15:57:32= .000000000 -0400 @@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block return ret; } @@ -28416,9 +27778,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/spectra= /ffsport.c linux-2.6.38.3/drive .owner =3D THIS_MODULE, .open =3D GLOB_SBD_open, .release =3D GLOB_SBD_release, -diff -urNp linux-2.6.38.3/drivers/staging/vme/devices/vme_user.c linux-2= .6.38.3/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.38.3/drivers/staging/vme/devices/vme_user.c 2011-03-14 21:= 20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/vme/devices/vme_user.c 2011-04-17 15:= 57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c linux-2= .6.38.4/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c 2011-03-14 21:= 20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c 2011-04-17 15:= 57:32.000000000 -0400 @@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(stru static int __devinit vme_user_probe(struct device *, int, int); static int __devexit vme_user_remove(struct device *, int, int); @@ -28428,9 +27790,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/vme/dev= ices/vme_user.c linux-2.6.38.3/ .open =3D vme_user_open, .release =3D vme_user_release, .read =3D vme_user_read, -diff -urNp linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cyasb= lkdev_block.c linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cya= sblkdev_block.c ---- linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cyasblkdev_b= lock.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cyasblkdev_b= lock.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasb= lkdev_block.c linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cya= sblkdev_block.c +--- linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_b= lock.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_b= lock.c 2011-04-17 15:57:32.000000000 -0400 @@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge =20 =20 @@ -28440,9 +27802,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/westbri= dge/astoria/block/cyasblkdev_bl .open =3D cyasblkdev_blk_open, .release =3D cyasblkdev_blk_release, .ioctl =3D cyasblkdev_blk_ioctl, -diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvc_console.h linux-2.6.38.3/d= rivers/tty/hvc/hvc_console.h ---- linux-2.6.38.3/drivers/tty/hvc/hvc_console.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/tty/hvc/hvc_console.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_console.h linux-2.6.38.4/d= rivers/tty/hvc/hvc_console.h +--- linux-2.6.38.4/drivers/tty/hvc/hvc_console.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/tty/hvc/hvc_console.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter /* register a vterm for hvc tty operation (module_init or hotplug add) = */ extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data, @@ -28451,9 +27813,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvc_con= sole.h linux-2.6.38.3/drivers/t /* remove a vterm from hvc tty operation (module_exit or hotplug remove= ) */ extern int hvc_remove(struct hvc_struct *hp); =20 -diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvcs.c linux-2.6.38.3/drivers/= tty/hvc/hvcs.c ---- linux-2.6.38.3/drivers/tty/hvc/hvcs.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/tty/hvc/hvcs.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvcs.c linux-2.6.38.4/drivers/= tty/hvc/hvcs.c +--- linux-2.6.38.4/drivers/tty/hvc/hvcs.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/tty/hvc/hvcs.c 2011-04-17 15:57:32.000000000 = -0400 @@ -83,6 +83,7 @@ #include #include @@ -28556,9 +27918,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvcs.c = linux-2.6.38.3/drivers/tty/hvc/ return 0; =20 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvc_xen.c linux-2.6.38.3/drive= rs/tty/hvc/hvc_xen.c ---- linux-2.6.38.3/drivers/tty/hvc/hvc_xen.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/tty/hvc/hvc_xen.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c linux-2.6.38.4/drive= rs/tty/hvc/hvc_xen.c +--- linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt return recv; } @@ -28595,9 +27957,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvc_xen= .c linux-2.6.38.3/drivers/tty/h =20 if (!xen_pv_domain()) return 0; -diff -urNp linux-2.6.38.3/drivers/tty/n_gsm.c linux-2.6.38.3/drivers/tty= /n_gsm.c ---- linux-2.6.38.3/drivers/tty/n_gsm.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/tty/n_gsm.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/tty/n_gsm.c linux-2.6.38.4/drivers/tty= /n_gsm.c +--- linux-2.6.38.4/drivers/tty/n_gsm.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/tty/n_gsm.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s return NULL; spin_lock_init(&dlci->lock); @@ -28607,9 +27969,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/n_gsm.c lin= ux-2.6.38.3/drivers/tty/n_gsm.c kfree(dlci); return NULL; } -diff -urNp linux-2.6.38.3/drivers/tty/n_tty.c linux-2.6.38.3/drivers/tty= /n_tty.c ---- linux-2.6.38.3/drivers/tty/n_tty.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/tty/n_tty.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/tty/n_tty.c linux-2.6.38.4/drivers/tty= /n_tty.c +--- linux-2.6.38.4/drivers/tty/n_tty.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/tty/n_tty.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ { *ops =3D tty_ldisc_N_TTY; @@ -28619,9 +27981,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/n_tty.c lin= ux-2.6.38.3/drivers/tty/n_tty.c + ops->flags =3D 0; } EXPORT_SYMBOL_GPL(n_tty_inherit_ops); -diff -urNp linux-2.6.38.3/drivers/tty/pty.c linux-2.6.38.3/drivers/tty/p= ty.c ---- linux-2.6.38.3/drivers/tty/pty.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/tty/pty.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/tty/pty.c linux-2.6.38.4/drivers/tty/p= ty.c +--- linux-2.6.38.4/drivers/tty/pty.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/tty/pty.c 2011-04-17 15:57:32.000000000 -0400 @@ -700,7 +700,18 @@ out: return retval; } @@ -28653,21 +28015,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/pty.c linu= x-2.6.38.3/drivers/tty/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0= ) -diff -urNp linux-2.6.38.3/drivers/tty/serial/8250_pci.c linux-2.6.38.3/d= rivers/tty/serial/8250_pci.c ---- linux-2.6.38.3/drivers/tty/serial/8250_pci.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/tty/serial/8250_pci.c 2011-04-17 15:57:32.000= 000000 -0400 -@@ -3818,7 +3818,7 @@ static struct pci_device_id serial_pci_t - PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, - 0xffff00, pbn_default }, -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - static struct pci_driver serial_pci_driver =3D { -diff -urNp linux-2.6.38.3/drivers/tty/serial/kgdboc.c linux-2.6.38.3/dri= vers/tty/serial/kgdboc.c ---- linux-2.6.38.3/drivers/tty/serial/kgdboc.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/tty/serial/kgdboc.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/drivers/tty/serial/kgdboc.c linux-2.6.38.4/dri= vers/tty/serial/kgdboc.c +--- linux-2.6.38.4/drivers/tty/serial/kgdboc.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/drivers/tty/serial/kgdboc.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -22,7 +22,7 @@ =20 #define MAX_CONFIG_LEN 40 @@ -28686,9 +28036,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/serial/kgdb= oc.c linux-2.6.38.3/drivers/tty .name =3D "kgdboc", .read_char =3D kgdboc_get_char, .write_char =3D kgdboc_put_char, -diff -urNp linux-2.6.38.3/drivers/tty/tty_io.c linux-2.6.38.3/drivers/tt= y/tty_io.c ---- linux-2.6.38.3/drivers/tty/tty_io.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/drivers/tty/tty_io.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/drivers/tty/tty_io.c linux-2.6.38.4/drivers/tt= y/tty_io.c +--- linux-2.6.38.4/drivers/tty/tty_io.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/drivers/tty/tty_io.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex); /* Spinlock to protect the tty->tty_files list */ DEFINE_SPINLOCK(tty_files_lock); @@ -28826,9 +28176,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/tty_io.c li= nux-2.6.38.3/drivers/tty/tty_io /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. -diff -urNp linux-2.6.38.3/drivers/tty/tty_ldisc.c linux-2.6.38.3/drivers= /tty/tty_ldisc.c ---- linux-2.6.38.3/drivers/tty/tty_ldisc.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/tty/tty_ldisc.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/tty/tty_ldisc.c linux-2.6.38.4/drivers= /tty/tty_ldisc.c +--- linux-2.6.38.4/drivers/tty/tty_ldisc.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/tty/tty_ldisc.c 2011-04-17 15:57:32.000000000= -0400 @@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc * if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo =3D ld->ops; @@ -28874,9 +28224,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/tty_ldisc.c= linux-2.6.38.3/drivers/tty/tty module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.38.3/drivers/tty/vt/keyboard.c linux-2.6.38.3/drive= rs/tty/vt/keyboard.c ---- linux-2.6.38.3/drivers/tty/vt/keyboard.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/tty/vt/keyboard.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/tty/vt/keyboard.c linux-2.6.38.4/drive= rs/tty/vt/keyboard.c +--- linux-2.6.38.4/drivers/tty/vt/keyboard.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/tty/vt/keyboard.c 2011-04-23 12:47:28.0000000= 00 -0400 @@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode =3D=3D VC_MEDIUMRAW) && value !=3D KVAL(K_SAK)) @@ -28894,18 +28244,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/vt/keyboar= d.c linux-2.6.38.3/drivers/tty/v fn_handler[value](vc); } =20 -@@ -1413,7 +1423,7 @@ static const struct input_device_id kbd_ - .evbit =3D { BIT_MASK(EV_SND) }, - }, -=20 -- { }, /* Terminating entry */ -+ { 0 }, /* Terminating entry */ - }; -=20 - MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.38.3/drivers/tty/vt/vt.c linux-2.6.38.3/drivers/tty= /vt/vt.c ---- linux-2.6.38.3/drivers/tty/vt/vt.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/drivers/tty/vt/vt.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/drivers/tty/vt/vt.c linux-2.6.38.4/drivers/tty= /vt/vt.c +--- linux-2.6.38.4/drivers/tty/vt/vt.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/drivers/tty/vt/vt.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier =20 static void notify_write(struct vc_data *vc, unsigned int unicode) @@ -28915,9 +28256,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/vt/vt.c lin= ux-2.6.38.3/drivers/tty/vt/vt.c atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); } =20 -diff -urNp linux-2.6.38.3/drivers/tty/vt/vt_ioctl.c linux-2.6.38.3/drive= rs/tty/vt/vt_ioctl.c ---- linux-2.6.38.3/drivers/tty/vt/vt_ioctl.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/tty/vt/vt_ioctl.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c linux-2.6.38.4/drive= rs/tty/vt/vt_ioctl.c +--- linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -28958,9 +28299,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/vt/vt_ioctl= .c linux-2.6.38.3/drivers/tty/v if (!perm) { ret =3D -EPERM; goto reterr; -diff -urNp linux-2.6.38.3/drivers/uio/uio.c linux-2.6.38.3/drivers/uio/u= io.c ---- linux-2.6.38.3/drivers/uio/uio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/drivers/uio/uio.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/drivers/uio/uio.c linux-2.6.38.4/drivers/uio/u= io.c +--- linux-2.6.38.4/drivers/uio/uio.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/drivers/uio/uio.c 2011-04-17 15:57:32.000000000 -0400 @@ -25,6 +25,7 @@ #include #include @@ -28994,9 +28335,9 @@ diff -urNp linux-2.6.38.3/drivers/uio/uio.c linux= -2.6.38.3/drivers/uio/uio.c } =20 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *v= mf) -diff -urNp linux-2.6.38.3/drivers/usb/atm/cxacru.c linux-2.6.38.3/driver= s/usb/atm/cxacru.c ---- linux-2.6.38.3/drivers/usb/atm/cxacru.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/usb/atm/cxacru.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/usb/atm/cxacru.c linux-2.6.38.4/driver= s/usb/atm/cxacru.c +--- linux-2.6.38.4/drivers/usb/atm/cxacru.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/usb/atm/cxacru.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c ret =3D sscanf(buf + pos, "%x=3D%x%n", &index, &value, &tmp); if (ret < 2) @@ -29006,9 +28347,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/atm/cxacru.= c linux-2.6.38.3/drivers/usb/at return -EINVAL; pos +=3D tmp; =20 -diff -urNp linux-2.6.38.3/drivers/usb/atm/usbatm.c linux-2.6.38.3/driver= s/usb/atm/usbatm.c ---- linux-2.6.38.3/drivers/usb/atm/usbatm.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/drivers/usb/atm/usbatm.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/drivers/usb/atm/usbatm.c linux-2.6.38.4/driver= s/usb/atm/usbatm.c +--- linux-2.6.38.4/drivers/usb/atm/usbatm.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/drivers/usb/atm/usbatm.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -29088,42 +28429,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/atm/usbatm= .c linux-2.6.38.3/drivers/usb/at =20 if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.38.3/drivers/usb/class/cdc-acm.c linux-2.6.38.3/dri= vers/usb/class/cdc-acm.c ---- linux-2.6.38.3/drivers/usb/class/cdc-acm.c 2011-04-18 17:27:16.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/usb/class/cdc-acm.c 2011-04-17 15:57:32.00000= 0000 -0400 -@@ -1640,7 +1640,7 @@ static const struct usb_device_id acm_id - { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, - USB_CDC_ACM_PROTO_AT_CDMA) }, -=20 -- { } -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.38.3/drivers/usb/class/usblp.c linux-2.6.38.3/drive= rs/usb/class/usblp.c ---- linux-2.6.38.3/drivers/usb/class/usblp.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/usb/class/usblp.c 2011-04-17 15:57:32.0000000= 00 -0400 -@@ -227,7 +227,7 @@ static const struct quirk_printer_struct - { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut = */ - { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1= 440 Laser Printer */ - { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Prin= ter M129C */ -- { 0, 0 } -+ { 0, 0, 0 } - }; -=20 - static int usblp_wwait(struct usblp *usblp, int nonblock); -@@ -1398,7 +1398,7 @@ static const struct usb_device_id usblp_ - { USB_INTERFACE_INFO(7, 1, 2) }, - { USB_INTERFACE_INFO(7, 1, 3) }, - { USB_DEVICE(0x04b8, 0x0202) }, /* Seiko Epson Receipt Printer M129C *= / -- { } /* Terminating entry */ -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ - }; -=20 - MODULE_DEVICE_TABLE(usb, usblp_ids); -diff -urNp linux-2.6.38.3/drivers/usb/core/hcd.c linux-2.6.38.3/drivers/= usb/core/hcd.c ---- linux-2.6.38.3/drivers/usb/core/hcd.c 2011-04-18 17:27:14.000000000 = -0400 -+++ linux-2.6.38.3/drivers/usb/core/hcd.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/usb/core/hcd.c linux-2.6.38.4/drivers/= usb/core/hcd.c +--- linux-2.6.38.4/drivers/usb/core/hcd.c 2011-04-22 19:20:59.000000000 = -0400 ++++ linux-2.6.38.4/drivers/usb/core/hcd.c 2011-04-22 19:21:23.000000000 = -0400 @@ -2457,7 +2457,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd =20 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -29142,21 +28450,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/core/hcd.c= linux-2.6.38.3/drivers/usb/core { =20 if (mon_ops) -diff -urNp linux-2.6.38.3/drivers/usb/core/hub.c linux-2.6.38.3/drivers/= usb/core/hub.c ---- linux-2.6.38.3/drivers/usb/core/hub.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/usb/core/hub.c 2011-04-17 15:57:32.000000000 = -0400 -@@ -3492,7 +3492,7 @@ static const struct usb_device_id hub_id - .bDeviceClass =3D USB_CLASS_HUB}, - { .match_flags =3D USB_DEVICE_ID_MATCH_INT_CLASS, - .bInterfaceClass =3D USB_CLASS_HUB}, -- { } /* Terminating entry */ -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ - }; -=20 - MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.38.3/drivers/usb/core/message.c linux-2.6.38.3/driv= ers/usb/core/message.c ---- linux-2.6.38.3/drivers/usb/core/message.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/usb/core/message.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/usb/core/message.c linux-2.6.38.4/driv= ers/usb/core/message.c +--- linux-2.6.38.4/drivers/usb/core/message.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/usb/core/message.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device buf =3D kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -29168,9 +28464,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/core/messag= e.c linux-2.6.38.3/drivers/usb/ if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.38.3/drivers/usb/early/ehci-dbgp.c linux-2.6.38.3/d= rivers/usb/early/ehci-dbgp.c ---- linux-2.6.38.3/drivers/usb/early/ehci-dbgp.c 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/drivers/usb/early/ehci-dbgp.c 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c linux-2.6.38.4/d= rivers/usb/early/ehci-dbgp.c +--- linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c 2011-04-17 15:57:32.000= 000000 -0400 @@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x, } =20 @@ -29189,33 +28485,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/early/ehci= -dbgp.c linux-2.6.38.3/drivers/u .name =3D "kgdbdbgp", .read_char =3D kgdbdbgp_read_char, .write_char =3D kgdbdbgp_write_char, -diff -urNp linux-2.6.38.3/drivers/usb/host/ehci-pci.c linux-2.6.38.3/dri= vers/usb/host/ehci-pci.c ---- linux-2.6.38.3/drivers/usb/host/ehci-pci.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/usb/host/ehci-pci.c 2011-04-17 15:57:32.00000= 0000 -0400 -@@ -516,7 +516,7 @@ static const struct pci_device_id pci_id - PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), - .driver_data =3D (unsigned long) &ehci_pci_hc_driver, - }, -- { /* end: all zeroes */ } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; - MODULE_DEVICE_TABLE(pci, pci_ids); -=20 -diff -urNp linux-2.6.38.3/drivers/usb/host/uhci-hcd.c linux-2.6.38.3/dri= vers/usb/host/uhci-hcd.c ---- linux-2.6.38.3/drivers/usb/host/uhci-hcd.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/usb/host/uhci-hcd.c 2011-04-17 15:57:32.00000= 0000 -0400 -@@ -948,7 +948,7 @@ static const struct pci_device_id uhci_p - /* handle any USB UHCI controller */ - PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), - .driver_data =3D (unsigned long) &uhci_driver, -- }, { /* end: all zeroes */ } -+ }, { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.38.3/drivers/usb/mon/mon_main.c linux-2.6.38.3/driv= ers/usb/mon/mon_main.c ---- linux-2.6.38.3/drivers/usb/mon/mon_main.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/usb/mon/mon_main.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/usb/mon/mon_main.c linux-2.6.38.4/driv= ers/usb/mon/mon_main.c +--- linux-2.6.38.4/drivers/usb/mon/mon_main.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/usb/mon/mon_main.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb =3D { /* * Ops @@ -29225,49 +28497,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/mon/mon_ma= in.c linux-2.6.38.3/drivers/usb/ .urb_submit =3D mon_submit, .urb_submit_error =3D mon_submit_error, .urb_complete =3D mon_complete, -diff -urNp linux-2.6.38.3/drivers/usb/storage/debug.h linux-2.6.38.3/dri= vers/usb/storage/debug.h ---- linux-2.6.38.3/drivers/usb/storage/debug.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/drivers/usb/storage/debug.h 2011-04-17 15:57:32.00000= 0000 -0400 -@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char=20 - #define US_DEBUGPX(x...) printk( x ) - #define US_DEBUG(x) x=20 - #else --#define US_DEBUGP(x...) --#define US_DEBUGPX(x...) --#define US_DEBUG(x) -+#define US_DEBUGP(x...) do {} while (0) -+#define US_DEBUGPX(x...) do {} while (0) -+#define US_DEBUG(x) do {} while (0) - #endif -=20 - #endif -diff -urNp linux-2.6.38.3/drivers/usb/storage/usb.c linux-2.6.38.3/drive= rs/usb/storage/usb.c ---- linux-2.6.38.3/drivers/usb/storage/usb.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/drivers/usb/storage/usb.c 2011-04-17 15:57:32.0000000= 00 -0400 -@@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l -=20 - static struct us_unusual_dev us_unusual_dev_list[] =3D { - # include "unusual_devs.h"=20 -- { } /* Terminating entry */ -+ { NULL, NULL, 0, 0, NULL } /* Terminating entry */ - }; -=20 - #undef UNUSUAL_DEV -diff -urNp linux-2.6.38.3/drivers/usb/storage/usual-tables.c linux-2.6.3= 8.3/drivers/usb/storage/usual-tables.c ---- linux-2.6.38.3/drivers/usb/storage/usual-tables.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/drivers/usb/storage/usual-tables.c 2011-04-17 15:57:3= 2.000000000 -0400 -@@ -48,7 +48,7 @@ -=20 - struct usb_device_id usb_storage_usb_ids[] =3D { - # include "unusual_devs.h" -- { } /* Terminating entry */ -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ - }; - EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -=20 -diff -urNp linux-2.6.38.3/drivers/vhost/vhost.c linux-2.6.38.3/drivers/v= host/vhost.c ---- linux-2.6.38.3/drivers/vhost/vhost.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/vhost/vhost.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/vhost/vhost.c linux-2.6.38.4/drivers/v= host/vhost.c +--- linux-2.6.38.4/drivers/vhost/vhost.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/vhost/vhost.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -565,7 +565,7 @@ static int init_used(struct vhost_virtqu return get_user(vq->last_used_idx, &used->idx); } @@ -29277,9 +28509,9 @@ diff -urNp linux-2.6.38.3/drivers/vhost/vhost.c l= inux-2.6.38.3/drivers/vhost/vho { struct file *eventfp, *filep =3D NULL, *pollstart =3D NULL, *pollstop =3D NULL; -diff -urNp linux-2.6.38.3/drivers/video/fbcmap.c linux-2.6.38.3/drivers/= video/fbcmap.c ---- linux-2.6.38.3/drivers/video/fbcmap.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/video/fbcmap.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/video/fbcmap.c linux-2.6.38.4/drivers/= video/fbcmap.c +--- linux-2.6.38.4/drivers/video/fbcmap.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/video/fbcmap.c 2011-04-17 15:57:32.000000000 = -0400 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc =3D -ENODEV; goto out; @@ -29290,9 +28522,9 @@ diff -urNp linux-2.6.38.3/drivers/video/fbcmap.c = linux-2.6.38.3/drivers/video/fb rc =3D -EINVAL; goto out1; } -diff -urNp linux-2.6.38.3/drivers/video/fbmem.c linux-2.6.38.3/drivers/v= ideo/fbmem.c ---- linux-2.6.38.3/drivers/video/fbmem.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/video/fbmem.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/drivers/video/fbmem.c linux-2.6.38.4/drivers/v= ideo/fbmem.c +--- linux-2.6.38.4/drivers/video/fbmem.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/drivers/video/fbmem.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx +=3D image->width + 8; } @@ -29320,21 +28552,9 @@ diff -urNp linux-2.6.38.3/drivers/video/fbmem.c = linux-2.6.38.3/drivers/video/fbm return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.38.3/drivers/video/fbmon.c linux-2.6.38.3/drivers/v= ideo/fbmon.c ---- linux-2.6.38.3/drivers/video/fbmon.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/drivers/video/fbmon.c 2011-04-17 15:57:32.000000000 -= 0400 -@@ -46,7 +46,7 @@ - #ifdef DEBUG - #define DPRINTK(fmt, args...) printk(fmt,## args) - #else --#define DPRINTK(fmt, args...) -+#define DPRINTK(fmt, args...) do {} while (0) - #endif -=20 - #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.38.3/drivers/video/i810/i810_accel.c linux-2.6.38.3= /drivers/video/i810/i810_accel.c ---- linux-2.6.38.3/drivers/video/i810/i810_accel.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/drivers/video/i810/i810_accel.c 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/drivers/video/i810/i810_accel.c linux-2.6.38.4= /drivers/video/i810/i810_accel.c +--- linux-2.6.38.4/drivers/video/i810/i810_accel.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/drivers/video/i810/i810_accel.c 2011-04-17 15:57:32.0= 00000000 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct=20 } } @@ -29343,340 +28563,9 @@ diff -urNp linux-2.6.38.3/drivers/video/i810/i8= 10_accel.c linux-2.6.38.3/drivers i810_report_error(mmio);=20 par->dev_flags |=3D LOCKUP; info->pixmap.scan_align =3D 1; -diff -urNp linux-2.6.38.3/drivers/video/i810/i810_main.c linux-2.6.38.3/= drivers/video/i810/i810_main.c ---- linux-2.6.38.3/drivers/video/i810/i810_main.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/drivers/video/i810/i810_main.c 2011-04-17 15:57:32.00= 0000000 -0400 -@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, - { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 }, -- { 0 }, -+ { 0, 0, 0, 0, 0, 0, 0 }, - }; -=20 - static struct pci_driver i810fb_driver =3D { -diff -urNp linux-2.6.38.3/drivers/video/modedb.c linux-2.6.38.3/drivers/= video/modedb.c ---- linux-2.6.38.3/drivers/video/modedb.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/video/modedb.c 2011-04-17 15:57:32.000000000 = -0400 -@@ -40,255 +40,255 @@ static const struct fb_videomode modedb[ -=20 - /* 640x400 @ 70 Hz, 31.5 kHz hsync */ - { NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 640x480 @ 60 Hz, 31.5 kHz hsync */ - { NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 800x600 @ 56 Hz, 35.15 kHz hsync */ - { NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync */ - { NULL, 87, 1024, 768, 22271, 56, 24, 33, 8, 160, 8, 0, -- FB_VMODE_INTERLACED }, -+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 640x400 @ 85 Hz, 37.86 kHz hsync */ - { NULL, 85, 640, 400, 31746, 96, 32, 41, 1, 64, 3, -- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED }, -+ FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 640x480 @ 72 Hz, 36.5 kHz hsync */ - { NULL, 72, 640, 480, 31746, 144, 40, 30, 8, 40, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 640x480 @ 75 Hz, 37.50 kHz hsync */ - { NULL, 75, 640, 480, 31746, 120, 16, 16, 1, 64, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 800x600 @ 60 Hz, 37.8 kHz hsync */ - { NULL, 60, 800, 600, 25000, 88, 40, 23, 1, 128, 4, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 640x480 @ 85 Hz, 43.27 kHz hsync */ - { NULL, 85, 640, 480, 27777, 80, 56, 25, 1, 56, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1152x864 @ 89 Hz interlaced, 44 kHz hsync */ - { NULL, 89, 1152, 864, 15384, 96, 16, 110, 1, 216, 10, 0, -- FB_VMODE_INTERLACED }, -+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, - /* 800x600 @ 72 Hz, 48.0 kHz hsync */ - { NULL, 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1024x768 @ 60 Hz, 48.4 kHz hsync */ - { NULL, 60, 1024, 768, 15384, 168, 8, 29, 3, 144, 6, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 640x480 @ 100 Hz, 53.01 kHz hsync */ - { NULL, 100, 640, 480, 21834, 96, 32, 36, 8, 96, 6, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1152x864 @ 60 Hz, 53.5 kHz hsync */ - { NULL, 60, 1152, 864, 11123, 208, 64, 16, 4, 256, 8, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 800x600 @ 85 Hz, 55.84 kHz hsync */ - { NULL, 85, 800, 600, 16460, 160, 64, 36, 16, 64, 5, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1024x768 @ 70 Hz, 56.5 kHz hsync */ - { NULL, 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */ - { NULL, 87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12, 0, -- FB_VMODE_INTERLACED }, -+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 800x600 @ 100 Hz, 64.02 kHz hsync */ - { NULL, 100, 800, 600, 14357, 160, 64, 30, 4, 64, 6, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1024x768 @ 76 Hz, 62.5 kHz hsync */ - { NULL, 76, 1024, 768, 11764, 208, 8, 36, 16, 120, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1152x864 @ 70 Hz, 62.4 kHz hsync */ - { NULL, 70, 1152, 864, 10869, 106, 56, 20, 1, 160, 10, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1280x1024 @ 61 Hz, 64.2 kHz hsync */ - { NULL, 61, 1280, 1024, 9090, 200, 48, 26, 1, 184, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1400x1050 @ 60Hz, 63.9 kHz hsync */ - { NULL, 60, 1400, 1050, 9259, 136, 40, 13, 1, 112, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1400x1050 @ 75,107 Hz, 82,392 kHz +hsync +vsync*/ - { NULL, 75, 1400, 1050, 7190, 120, 56, 23, 10, 112, 13, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1400x1050 @ 60 Hz, ? kHz +hsync +vsync*/ - { NULL, 60, 1400, 1050, 9259, 128, 40, 12, 0, 112, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1024x768 @ 85 Hz, 70.24 kHz hsync */ - { NULL, 85, 1024, 768, 10111, 192, 32, 34, 14, 160, 6, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1152x864 @ 78 Hz, 70.8 kHz hsync */ - { NULL, 78, 1152, 864, 9090, 228, 88, 32, 0, 84, 12, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1280x1024 @ 70 Hz, 74.59 kHz hsync */ - { NULL, 70, 1280, 1024, 7905, 224, 32, 28, 8, 160, 8, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1600x1200 @ 60Hz, 75.00 kHz hsync */ - { NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1152x864 @ 84 Hz, 76.0 kHz hsync */ - { NULL, 84, 1152, 864, 7407, 184, 312, 32, 0, 128, 12, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1280x1024 @ 74 Hz, 78.85 kHz hsync */ - { NULL, 74, 1280, 1024, 7407, 256, 32, 34, 3, 144, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1024x768 @ 100Hz, 80.21 kHz hsync */ - { NULL, 100, 1024, 768, 8658, 192, 32, 21, 3, 192, 10, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1280x1024 @ 76 Hz, 81.13 kHz hsync */ - { NULL, 76, 1280, 1024, 7407, 248, 32, 34, 3, 104, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1600x1200 @ 70 Hz, 87.50 kHz hsync */ - { NULL, 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1152x864 @ 100 Hz, 89.62 kHz hsync */ - { NULL, 100, 1152, 864, 7264, 224, 32, 17, 2, 128, 19, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1280x1024 @ 85 Hz, 91.15 kHz hsync */ - { NULL, 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1600x1200 @ 75 Hz, 93.75 kHz hsync */ - { NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1680x1050 @ 60 Hz, 65.191 kHz hsync */ - { NULL, 60, 1680, 1050, 6848, 280, 104, 30, 3, 176, 6, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1600x1200 @ 85 Hz, 105.77 kHz hsync */ - { NULL, 85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1280x1024 @ 100 Hz, 107.16 kHz hsync */ - { NULL, 100, 1280, 1024, 5502, 256, 32, 26, 7, 128, 15, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1800x1440 @ 64Hz, 96.15 kHz hsync */ - { NULL, 64, 1800, 1440, 4347, 304, 96, 46, 1, 192, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1800x1440 @ 70Hz, 104.52 kHz hsync */ - { NULL, 70, 1800, 1440, 4000, 304, 96, 46, 1, 192, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 512x384 @ 78 Hz, 31.50 kHz hsync */ - { NULL, 78, 512, 384, 49603, 48, 16, 16, 1, 64, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 512x384 @ 85 Hz, 34.38 kHz hsync */ - { NULL, 85, 512, 384, 45454, 48, 16, 16, 1, 64, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio */ - { NULL, 70, 320, 200, 79440, 16, 16, 20, 4, 48, 1, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio */ - { NULL, 60, 320, 240, 79440, 16, 16, 16, 5, 48, 1, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 320x240 @ 72 Hz, 36.5 kHz hsync */ - { NULL, 72, 320, 240, 63492, 16, 16, 16, 4, 48, 2, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio */ - { NULL, 56, 400, 300, 55555, 64, 16, 10, 1, 32, 1, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 400x300 @ 60 Hz, 37.8 kHz hsync */ - { NULL, 60, 400, 300, 50000, 48, 16, 11, 1, 64, 2, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 400x300 @ 72 Hz, 48.0 kHz hsync */ - { NULL, 72, 400, 300, 40000, 32, 24, 11, 19, 64, 3, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio */ - { NULL, 56, 480, 300, 46176, 80, 16, 10, 1, 40, 1, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 480x300 @ 60 Hz, 37.8 kHz hsync */ - { NULL, 60, 480, 300, 41858, 56, 16, 11, 1, 80, 2, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 480x300 @ 63 Hz, 39.6 kHz hsync */ - { NULL, 63, 480, 300, 40000, 56, 16, 11, 1, 80, 2, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 480x300 @ 72 Hz, 48.0 kHz hsync */ - { NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, 0, -- FB_VMODE_DOUBLE }, -+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, -=20 - /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */ - { NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */ - { NULL, 60, 1152, 768, 14047, 158, 26, 29, 3, 136, 6, - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */ - { NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 1280x800, 60 Hz, 47.403 kHz hsync, WXGA 16:10 aspect ratio */ - { NULL, 60, 1280, 800, 12048, 200, 64, 24, 1, 136, 3, 0, -- FB_VMODE_NONINTERLACED }, -+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 720x576i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ - { NULL, 50, 720, 576, 74074, 64, 16, 39, 5, 64, 5, 0, -- FB_VMODE_INTERLACED }, -+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 800x520i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ - { NULL, 50, 800, 520, 58823, 144, 64, 72, 28, 80, 5, 0, -- FB_VMODE_INTERLACED }, -+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, -=20 - /* 864x480 @ 60 Hz, 35.15 kHz hsync */ - { NULL, 60, 864, 480, 27777, 1, 1, 1, 1, 0, 0, -- 0, FB_VMODE_NONINTERLACED }, -+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, - }; -=20 - #ifdef CONFIG_FB_MODE_HELPERS -diff -urNp linux-2.6.38.3/drivers/video/pxa3xx-gcu.c linux-2.6.38.3/driv= ers/video/pxa3xx-gcu.c ---- linux-2.6.38.3/drivers/video/pxa3xx-gcu.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/drivers/video/pxa3xx-gcu.c 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/drivers/video/pxa3xx-gcu.c linux-2.6.38.4/driv= ers/video/pxa3xx-gcu.c +--- linux-2.6.38.4/drivers/video/pxa3xx-gcu.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/drivers/video/pxa3xx-gcu.c 2011-04-17 15:57:32.000000= 000 -0400 @@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv { dma_addr_t shared_phys; struct resource *resource_mem; @@ -29686,9 +28575,9 @@ diff -urNp linux-2.6.38.3/drivers/video/pxa3xx-gc= u.c linux-2.6.38.3/drivers/vide wait_queue_head_t wait_idle; wait_queue_head_t wait_free; spinlock_t spinlock; -diff -urNp linux-2.6.38.3/drivers/video/uvesafb.c linux-2.6.38.3/drivers= /video/uvesafb.c ---- linux-2.6.38.3/drivers/video/uvesafb.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/drivers/video/uvesafb.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/drivers/video/uvesafb.c linux-2.6.38.4/drivers= /video/uvesafb.c +--- linux-2.6.38.4/drivers/video/uvesafb.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/drivers/video/uvesafb.c 2011-04-17 15:57:32.000000000= -0400 @@ -19,6 +19,7 @@ #include #include @@ -29764,9 +28653,9 @@ diff -urNp linux-2.6.38.3/drivers/video/uvesafb.c= linux-2.6.38.3/drivers/video/u } =20 framebuffer_release(info); -diff -urNp linux-2.6.38.3/drivers/video/vesafb.c linux-2.6.38.3/drivers/= video/vesafb.c ---- linux-2.6.38.3/drivers/video/vesafb.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/drivers/video/vesafb.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/drivers/video/vesafb.c linux-2.6.38.4/drivers/= video/vesafb.c +--- linux-2.6.38.4/drivers/video/vesafb.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/drivers/video/vesafb.c 2011-04-17 15:57:32.000000000 = -0400 @@ -9,6 +9,7 @@ */ =20 @@ -29870,9 +28759,9 @@ diff -urNp linux-2.6.38.3/drivers/video/vesafb.c = linux-2.6.38.3/drivers/video/ve if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.38.3/fs/9p/vfs_inode.c linux-2.6.38.3/fs/9p/vfs_ino= de.c ---- linux-2.6.38.3/fs/9p/vfs_inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/9p/vfs_inode.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/9p/vfs_inode.c linux-2.6.38.4/fs/9p/vfs_ino= de.c +--- linux-2.6.38.4/fs/9p/vfs_inode.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/9p/vfs_inode.c 2011-04-17 15:57:32.000000000 -0400 @@ -1094,7 +1094,7 @@ static void *v9fs_vfs_follow_link(struct void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -29882,9 +28771,9 @@ diff -urNp linux-2.6.38.3/fs/9p/vfs_inode.c linux= -2.6.38.3/fs/9p/vfs_inode.c =20 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "" : s); -diff -urNp linux-2.6.38.3/fs/aio.c linux-2.6.38.3/fs/aio.c ---- linux-2.6.38.3/fs/aio.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/fs/aio.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/aio.c linux-2.6.38.4/fs/aio.c +--- linux-2.6.38.4/fs/aio.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/fs/aio.c 2011-04-17 15:57:32.000000000 -0400 @@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx=20 size +=3D sizeof(struct io_event) * nr_events; nr_pages =3D (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -29894,9 +28783,9 @@ diff -urNp linux-2.6.38.3/fs/aio.c linux-2.6.38.3= /fs/aio.c return -EINVAL; =20 nr_events =3D (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeo= f(struct io_event); -diff -urNp linux-2.6.38.3/fs/attr.c linux-2.6.38.3/fs/attr.c ---- linux-2.6.38.3/fs/attr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/attr.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/attr.c linux-2.6.38.4/fs/attr.c +--- linux-2.6.38.4/fs/attr.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/attr.c 2011-04-17 15:57:32.000000000 -0400 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode=20 unsigned long limit; =20 @@ -29905,9 +28794,9 @@ diff -urNp linux-2.6.38.3/fs/attr.c linux-2.6.38.= 3/fs/attr.c if (limit !=3D RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-2.6.38.3/fs/befs/linuxvfs.c linux-2.6.38.3/fs/befs/linu= xvfs.c ---- linux-2.6.38.3/fs/befs/linuxvfs.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/befs/linuxvfs.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/fs/befs/linuxvfs.c linux-2.6.38.4/fs/befs/linu= xvfs.c +--- linux-2.6.38.4/fs/befs/linuxvfs.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/fs/befs/linuxvfs.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -499,7 +499,7 @@ static void befs_put_link(struct dentry=20 { befs_inode_info *befs_ino =3D BEFS_I(dentry->d_inode); @@ -29917,9 +28806,9 @@ diff -urNp linux-2.6.38.3/fs/befs/linuxvfs.c linu= x-2.6.38.3/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.38.3/fs/binfmt_aout.c linux-2.6.38.3/fs/binfmt_aout= .c ---- linux-2.6.38.3/fs/binfmt_aout.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/binfmt_aout.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/binfmt_aout.c linux-2.6.38.4/fs/binfmt_aout= .c +--- linux-2.6.38.4/fs/binfmt_aout.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/binfmt_aout.c 2011-04-17 15:57:32.000000000 -0400 @@ -16,6 +16,7 @@ #include #include @@ -29996,9 +28885,9 @@ diff -urNp linux-2.6.38.3/fs/binfmt_aout.c linux-= 2.6.38.3/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c ---- linux-2.6.38.3/fs/binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/binfmt_elf.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/binfmt_elf.c linux-2.6.38.4/fs/binfmt_elf.c +--- linux-2.6.38.4/fs/binfmt_elf.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/fs/binfmt_elf.c 2011-04-22 19:21:23.000000000 -0400 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump #define elf_core_dump NULL #endif @@ -30490,7 +29379,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c } =20 if (elf_interpreter) { -@@ -1086,7 +1391,7 @@ out: +@@ -1090,7 +1395,7 @@ out: * Decide what to dump of a segment, part, all or none. */ static unsigned long vma_dump_size(struct vm_area_struct *vma, @@ -30499,7 +29388,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c { #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type)) =20 -@@ -1120,7 +1425,7 @@ static unsigned long vma_dump_size(struc +@@ -1124,7 +1429,7 @@ static unsigned long vma_dump_size(struc if (vma->vm_file =3D=3D NULL) return 0; =20 @@ -30508,7 +29397,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c goto whole; =20 /* -@@ -1342,9 +1647,9 @@ static void fill_auxv_note(struct memelf +@@ -1346,9 +1651,9 @@ static void fill_auxv_note(struct memelf { elf_addr_t *auxv =3D (elf_addr_t *) mm->saved_auxv; int i =3D 0; @@ -30520,7 +29409,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); } =20 -@@ -1850,14 +2155,14 @@ static void fill_extnum_info(struct elfh +@@ -1854,14 +2159,14 @@ static void fill_extnum_info(struct elfh } =20 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma, @@ -30537,7 +29426,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c return size; } =20 -@@ -1951,7 +2256,7 @@ static int elf_core_dump(struct coredump +@@ -1955,7 +2260,7 @@ static int elf_core_dump(struct coredump =20 dataoff =3D offset =3D roundup(offset, ELF_EXEC_PAGESIZE); =20 @@ -30546,7 +29435,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c offset +=3D elf_core_extra_data_size(); e_shoff =3D offset; =20 -@@ -1965,10 +2270,12 @@ static int elf_core_dump(struct coredump +@@ -1969,10 +2274,12 @@ static int elf_core_dump(struct coredump offset =3D dataoff; =20 size +=3D sizeof(*elf); @@ -30559,7 +29448,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c if (size > cprm->limit || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note))) goto end_coredump; -@@ -1982,7 +2289,7 @@ static int elf_core_dump(struct coredump +@@ -1986,7 +2293,7 @@ static int elf_core_dump(struct coredump phdr.p_offset =3D offset; phdr.p_vaddr =3D vma->vm_start; phdr.p_paddr =3D 0; @@ -30568,7 +29457,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c phdr.p_memsz =3D vma->vm_end - vma->vm_start; offset +=3D phdr.p_filesz; phdr.p_flags =3D vma->vm_flags & VM_READ ? PF_R : 0; -@@ -1993,6 +2300,7 @@ static int elf_core_dump(struct coredump +@@ -1997,6 +2304,7 @@ static int elf_core_dump(struct coredump phdr.p_align =3D ELF_EXEC_PAGESIZE; =20 size +=3D sizeof(phdr); @@ -30576,7 +29465,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c if (size > cprm->limit || !dump_write(cprm->file, &phdr, sizeof(phdr))) goto end_coredump; -@@ -2017,7 +2325,7 @@ static int elf_core_dump(struct coredump +@@ -2021,7 +2329,7 @@ static int elf_core_dump(struct coredump unsigned long addr; unsigned long end; =20 @@ -30585,7 +29474,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c =20 for (addr =3D vma->vm_start; addr < end; addr +=3D PAGE_SIZE) { struct page *page; -@@ -2026,6 +2334,7 @@ static int elf_core_dump(struct coredump +@@ -2030,6 +2338,7 @@ static int elf_core_dump(struct coredump page =3D get_dump_page(addr); if (page) { void *kaddr =3D kmap(page); @@ -30593,7 +29482,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c stop =3D ((size +=3D PAGE_SIZE) > cprm->limit) || !dump_write(cprm->file, kaddr, PAGE_SIZE); -@@ -2043,6 +2352,7 @@ static int elf_core_dump(struct coredump +@@ -2047,6 +2356,7 @@ static int elf_core_dump(struct coredump =20 if (e_phnum =3D=3D PN_XNUM) { size +=3D sizeof(*shdr4extnum); @@ -30601,7 +29490,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c if (size > cprm->limit || !dump_write(cprm->file, shdr4extnum, sizeof(*shdr4extnum))) -@@ -2063,6 +2373,97 @@ out: +@@ -2067,6 +2377,97 @@ out: =20 #endif /* CONFIG_ELF_CORE */ =20 @@ -30699,9 +29588,9 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2= .6.38.3/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.38.3/fs/binfmt_flat.c linux-2.6.38.3/fs/binfmt_flat= .c ---- linux-2.6.38.3/fs/binfmt_flat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/binfmt_flat.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/binfmt_flat.c linux-2.6.38.4/fs/binfmt_flat= .c +--- linux-2.6.38.4/fs/binfmt_flat.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/binfmt_flat.c 2011-04-17 15:57:32.000000000 -0400 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b realdatastart =3D (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -30734,21 +29623,9 @@ diff -urNp linux-2.6.38.3/fs/binfmt_flat.c linux= -2.6.38.3/fs/binfmt_flat.c ret =3D result; goto err; } -diff -urNp linux-2.6.38.3/fs/binfmt_misc.c linux-2.6.38.3/fs/binfmt_misc= .c ---- linux-2.6.38.3/fs/binfmt_misc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/binfmt_misc.c 2011-04-17 15:57:32.000000000 -0400 -@@ -698,7 +698,7 @@ static int bm_fill_super(struct super_bl - static struct tree_descr bm_files[] =3D { - [2] =3D {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, - [3] =3D {"register", &bm_register_operations, S_IWUSR}, -- /* last one */ {""} -+ /* last one */ {"", NULL, 0} - }; - int err =3D simple_fill_super(sb, 0x42494e4d, bm_files); - if (!err) -diff -urNp linux-2.6.38.3/fs/bio.c linux-2.6.38.3/fs/bio.c ---- linux-2.6.38.3/fs/bio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/bio.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/bio.c linux-2.6.38.4/fs/bio.c +--- linux-2.6.38.4/fs/bio.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/bio.c 2011-04-17 15:57:32.000000000 -0400 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b const int read =3D bio_data_dir(bio) =3D=3D READ; struct bio_map_data *bmd =3D bio->bi_private; @@ -30758,9 +29635,9 @@ diff -urNp linux-2.6.38.3/fs/bio.c linux-2.6.38.3= /fs/bio.c =20 __bio_for_each_segment(bvec, bio, i, 0) { char *addr =3D page_address(bvec->bv_page); -diff -urNp linux-2.6.38.3/fs/block_dev.c linux-2.6.38.3/fs/block_dev.c ---- linux-2.6.38.3/fs/block_dev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/block_dev.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/block_dev.c linux-2.6.38.4/fs/block_dev.c +--- linux-2.6.38.4/fs/block_dev.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/block_dev.c 2011-04-17 15:57:32.000000000 -0400 @@ -669,7 +669,7 @@ static bool bd_may_claim(struct block_de else if (bdev->bd_contains =3D=3D bdev) return true; /* is a whole device which isn't held */ @@ -30770,9 +29647,9 @@ diff -urNp linux-2.6.38.3/fs/block_dev.c linux-2.= 6.38.3/fs/block_dev.c return true; /* is a partition of a device that is being partitione= d */ else if (whole->bd_holder !=3D NULL) return false; /* is a partition of a held device */ -diff -urNp linux-2.6.38.3/fs/btrfs/ctree.c linux-2.6.38.3/fs/btrfs/ctree= .c ---- linux-2.6.38.3/fs/btrfs/ctree.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/btrfs/ctree.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/btrfs/ctree.c linux-2.6.38.4/fs/btrfs/ctree= .c +--- linux-2.6.38.4/fs/btrfs/ctree.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/btrfs/ctree.c 2011-04-17 15:57:32.000000000 -0400 @@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st free_extent_buffer(buf); add_root_to_dirty_list(root); @@ -30797,9 +29674,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/ctree.c linux-= 2.6.38.3/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret =3D fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.38.3/fs/btrfs/disk-io.c linux-2.6.38.3/fs/btrfs/dis= k-io.c ---- linux-2.6.38.3/fs/btrfs/disk-io.c 2011-04-18 17:27:18.000000000 -040= 0 -+++ linux-2.6.38.3/fs/btrfs/disk-io.c 2011-04-17 16:53:48.000000000 -040= 0 +diff -urNp linux-2.6.38.4/fs/btrfs/disk-io.c linux-2.6.38.4/fs/btrfs/dis= k-io.c +--- linux-2.6.38.4/fs/btrfs/disk-io.c 2011-04-18 17:27:18.000000000 -040= 0 ++++ linux-2.6.38.4/fs/btrfs/disk-io.c 2011-04-17 16:53:48.000000000 -040= 0 @@ -41,7 +41,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -30818,9 +29695,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/disk-io.c linu= x-2.6.38.3/fs/btrfs/disk-io.c .write_cache_pages_lock_hook =3D btree_lock_page_hook, .readpage_end_io_hook =3D btree_readpage_end_io_hook, .submit_bio_hook =3D btree_submit_bio_hook, -diff -urNp linux-2.6.38.3/fs/btrfs/extent_io.h linux-2.6.38.3/fs/btrfs/e= xtent_io.h ---- linux-2.6.38.3/fs/btrfs/extent_io.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/fs/btrfs/extent_io.h 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/fs/btrfs/extent_io.h linux-2.6.38.4/fs/btrfs/e= xtent_io.h +--- linux-2.6.38.4/fs/btrfs/extent_io.h 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/fs/btrfs/extent_io.h 2011-04-17 15:57:32.000000000 -0= 400 @@ -55,36 +55,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags, u64 bio_offset); @@ -30881,9 +29758,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/extent_io.h li= nux-2.6.38.3/fs/btrfs/extent_io }; =20 struct extent_state { -diff -urNp linux-2.6.38.3/fs/btrfs/free-space-cache.c linux-2.6.38.3/fs/= btrfs/free-space-cache.c ---- linux-2.6.38.3/fs/btrfs/free-space-cache.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/fs/btrfs/free-space-cache.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/fs/btrfs/free-space-cache.c linux-2.6.38.4/fs/= btrfs/free-space-cache.c +--- linux-2.6.38.4/fs/btrfs/free-space-cache.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/fs/btrfs/free-space-cache.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -1855,8 +1855,6 @@ u64 btrfs_alloc_from_cluster(struct btrf =20 while(1) { @@ -30902,9 +29779,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/free-space-cac= he.c linux-2.6.38.3/fs/btrfs/fr =20 if (entry->bitmap && entry->bytes > bytes + empty_size) { ret =3D btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.38.3/fs/btrfs/inode.c linux-2.6.38.3/fs/btrfs/inode= .c ---- linux-2.6.38.3/fs/btrfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/btrfs/inode.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/btrfs/inode.c linux-2.6.38.4/fs/btrfs/inode= .c +--- linux-2.6.38.4/fs/btrfs/inode.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/btrfs/inode.c 2011-04-17 15:57:32.000000000 -0400 @@ -64,7 +64,7 @@ static const struct inode_operations btr static const struct address_space_operations btrfs_aops; static const struct address_space_operations btrfs_symlink_aops; @@ -30947,9 +29824,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/inode.c linux-= 2.6.38.3/fs/btrfs/inode.c .fill_delalloc =3D run_delalloc_range, .submit_bio_hook =3D btrfs_submit_bio_hook, .merge_bio_hook =3D btrfs_merge_bio_hook, -diff -urNp linux-2.6.38.3/fs/btrfs/ioctl.c linux-2.6.38.3/fs/btrfs/ioctl= .c ---- linux-2.6.38.3/fs/btrfs/ioctl.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.3/fs/btrfs/ioctl.c 2011-04-17 16:53:48.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/btrfs/ioctl.c linux-2.6.38.4/fs/btrfs/ioctl= .c +--- linux-2.6.38.4/fs/btrfs/ioctl.c 2011-04-18 17:27:18.000000000 -0400 ++++ linux-2.6.38.4/fs/btrfs/ioctl.c 2011-04-17 16:53:48.000000000 -0400 @@ -2274,9 +2274,12 @@ long btrfs_ioctl_space_info(struct btrfs for (i =3D 0; i < num_types; i++) { struct btrfs_space_info *tmp; @@ -30974,9 +29851,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/ioctl.c linux-= 2.6.38.3/fs/btrfs/ioctl.c } up_read(&info->groups_sem); } -diff -urNp linux-2.6.38.3/fs/btrfs/relocation.c linux-2.6.38.3/fs/btrfs/= relocation.c ---- linux-2.6.38.3/fs/btrfs/relocation.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/fs/btrfs/relocation.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/fs/btrfs/relocation.c linux-2.6.38.4/fs/btrfs/= relocation.c +--- linux-2.6.38.4/fs/btrfs/relocation.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/fs/btrfs/relocation.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt } spin_unlock(&rc->reloc_root_tree.lock); @@ -30986,9 +29863,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/relocation.c l= inux-2.6.38.3/fs/btrfs/relocati =20 if (!del) { spin_lock(&rc->reloc_root_tree.lock); -diff -urNp linux-2.6.38.3/fs/cachefiles/bind.c linux-2.6.38.3/fs/cachefi= les/bind.c ---- linux-2.6.38.3/fs/cachefiles/bind.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/fs/cachefiles/bind.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/fs/cachefiles/bind.c linux-2.6.38.4/fs/cachefi= les/bind.c +--- linux-2.6.38.4/fs/cachefiles/bind.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/fs/cachefiles/bind.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); =20 @@ -31005,9 +29882,9 @@ diff -urNp linux-2.6.38.3/fs/cachefiles/bind.c li= nux-2.6.38.3/fs/cachefiles/bind cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); =20 -diff -urNp linux-2.6.38.3/fs/cachefiles/daemon.c linux-2.6.38.3/fs/cache= files/daemon.c ---- linux-2.6.38.3/fs/cachefiles/daemon.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/fs/cachefiles/daemon.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/fs/cachefiles/daemon.c linux-2.6.38.4/fs/cache= files/daemon.c +--- linux-2.6.38.4/fs/cachefiles/daemon.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/fs/cachefiles/daemon.c 2011-04-17 15:57:32.000000000 = -0400 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st if (n > buflen) return -EMSGSIZE; @@ -31044,9 +29921,9 @@ diff -urNp linux-2.6.38.3/fs/cachefiles/daemon.c = linux-2.6.38.3/fs/cachefiles/da return cachefiles_daemon_range_error(cache, args); =20 cache->bstop_percent =3D bstop; -diff -urNp linux-2.6.38.3/fs/cachefiles/rdwr.c linux-2.6.38.3/fs/cachefi= les/rdwr.c ---- linux-2.6.38.3/fs/cachefiles/rdwr.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/fs/cachefiles/rdwr.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/fs/cachefiles/rdwr.c linux-2.6.38.4/fs/cachefi= les/rdwr.c +--- linux-2.6.38.4/fs/cachefiles/rdwr.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/fs/cachefiles/rdwr.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache old_fs =3D get_fs(); set_fs(KERNEL_DS); @@ -31056,9 +29933,9 @@ diff -urNp linux-2.6.38.3/fs/cachefiles/rdwr.c li= nux-2.6.38.3/fs/cachefiles/rdwr set_fs(old_fs); kunmap(page); if (ret !=3D len) -diff -urNp linux-2.6.38.3/fs/ceph/dir.c linux-2.6.38.3/fs/ceph/dir.c ---- linux-2.6.38.3/fs/ceph/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ceph/dir.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ceph/dir.c linux-2.6.38.4/fs/ceph/dir.c +--- linux-2.6.38.4/fs/ceph/dir.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ceph/dir.c 2011-04-17 15:57:32.000000000 -0400 @@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil struct ceph_fs_client *fsc =3D ceph_inode_to_client(inode); struct ceph_mds_client *mdsc =3D fsc->mdsc; @@ -31077,21 +29954,9 @@ diff -urNp linux-2.6.38.3/fs/ceph/dir.c linux-2.= 6.38.3/fs/ceph/dir.c u64 pos =3D ceph_make_fpos(frag, off); struct ceph_mds_reply_inode *in =3D rinfo->dir_in[off - fi->offset].in; -diff -urNp linux-2.6.38.3/fs/cifs/cifs_uniupr.h linux-2.6.38.3/fs/cifs/c= ifs_uniupr.h ---- linux-2.6.38.3/fs/cifs/cifs_uniupr.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/fs/cifs/cifs_uniupr.h 2011-04-17 15:57:32.000000000 -= 0400 -@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa - {0x0490, 0x04cc, UniCaseRangeU0490}, - {0x1e00, 0x1ffc, UniCaseRangeU1e00}, - {0xff40, 0xff5a, UniCaseRangeUff40}, -- {0} -+ {0, 0, NULL} - }; - #endif -=20 -diff -urNp linux-2.6.38.3/fs/cifs/link.c linux-2.6.38.3/fs/cifs/link.c ---- linux-2.6.38.3/fs/cifs/link.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/cifs/link.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/cifs/link.c linux-2.6.38.4/fs/cifs/link.c +--- linux-2.6.38.4/fs/cifs/link.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/cifs/link.c 2011-04-17 15:57:32.000000000 -0400 @@ -577,7 +577,7 @@ symlink_exit: =20 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void = *cookie) @@ -31101,9 +29966,9 @@ diff -urNp linux-2.6.38.3/fs/cifs/link.c linux-2.= 6.38.3/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.38.3/fs/compat_binfmt_elf.c linux-2.6.38.3/fs/compa= t_binfmt_elf.c ---- linux-2.6.38.3/fs/compat_binfmt_elf.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/fs/compat_binfmt_elf.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/fs/compat_binfmt_elf.c linux-2.6.38.4/fs/compa= t_binfmt_elf.c +--- linux-2.6.38.4/fs/compat_binfmt_elf.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/fs/compat_binfmt_elf.c 2011-04-17 15:57:32.000000000 = -0400 @@ -30,11 +30,13 @@ #undef elf_phdr #undef elf_shdr @@ -31118,9 +29983,9 @@ diff -urNp linux-2.6.38.3/fs/compat_binfmt_elf.c = linux-2.6.38.3/fs/compat_binfmt #define elf_addr_t Elf32_Addr =20 /* -diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.38.3/fs/compat.c ---- linux-2.6.38.3/fs/compat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/compat.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/compat.c linux-2.6.38.4/fs/compat.c +--- linux-2.6.38.4/fs/compat.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/compat.c 2011-04-23 14:05:14.000000000 -0400 @@ -594,7 +594,7 @@ ssize_t compat_rw_copy_check_uvector(int goto out; =20 @@ -31211,15 +30076,7 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.= 38.3/fs/compat.c =20 error =3D vfs_readdir(file, compat_filldir64, &buf); if (error >=3D 0) -@@ -1423,6 +1441,7 @@ static int compat_copy_strings(int argc, -=20 - page =3D get_arg_page(bprm, pos, 1); - if (!page) { -+ /* We've exceed the stack rlimit. */ - ret =3D -E2BIG; - goto out; - } -@@ -1464,6 +1483,11 @@ int compat_do_execve(char * filename, +@@ -1464,6 +1482,11 @@ int compat_do_execve(char * filename, compat_uptr_t __user *envp, struct pt_regs * regs) { @@ -31231,7 +30088,7 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.3= 8.3/fs/compat.c struct linux_binprm *bprm; struct file *file; struct files_struct *displaced; -@@ -1500,6 +1524,19 @@ int compat_do_execve(char * filename, +@@ -1500,6 +1523,19 @@ int compat_do_execve(char * filename, bprm->filename =3D filename; bprm->interp =3D filename; =20 @@ -31251,7 +30108,7 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.3= 8.3/fs/compat.c retval =3D bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1529,9 +1566,40 @@ int compat_do_execve(char * filename, +@@ -1529,9 +1565,40 @@ int compat_do_execve(char * filename, if (retval < 0) goto out; =20 @@ -31293,7 +30150,7 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.3= 8.3/fs/compat.c =20 /* execve succeeded */ current->fs->in_exec =3D 0; -@@ -1542,6 +1610,14 @@ int compat_do_execve(char * filename, +@@ -1542,6 +1609,14 @@ int compat_do_execve(char * filename, put_files_struct(displaced); return retval; =20 @@ -31308,9 +30165,9 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.3= 8.3/fs/compat.c out: if (bprm->mm) { acct_arg_size(bprm, 0); -diff -urNp linux-2.6.38.3/fs/compat_ioctl.c linux-2.6.38.3/fs/compat_ioc= tl.c ---- linux-2.6.38.3/fs/compat_ioctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/compat_ioctl.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/compat_ioctl.c linux-2.6.38.4/fs/compat_ioc= tl.c +--- linux-2.6.38.4/fs/compat_ioctl.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/compat_ioctl.c 2011-04-17 15:57:32.000000000 -0400 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi =20 err =3D get_user(palp, &up->palette); @@ -31331,9 +30188,9 @@ diff -urNp linux-2.6.38.3/fs/compat_ioctl.c linux= -2.6.38.3/fs/compat_ioctl.c if (a > b) return 1; if (a < b) -diff -urNp linux-2.6.38.3/fs/dcache.c linux-2.6.38.3/fs/dcache.c ---- linux-2.6.38.3/fs/dcache.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/fs/dcache.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/dcache.c linux-2.6.38.4/fs/dcache.c +--- linux-2.6.38.4/fs/dcache.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/fs/dcache.c 2011-04-17 15:57:32.000000000 -0400 @@ -3092,7 +3092,7 @@ void __init vfs_caches_init(unsigned lon mempages -=3D reserve; =20 @@ -31343,21 +30200,9 @@ diff -urNp linux-2.6.38.3/fs/dcache.c linux-2.6.= 38.3/fs/dcache.c =20 dcache_init(); inode_init(); -diff -urNp linux-2.6.38.3/fs/debugfs/inode.c linux-2.6.38.3/fs/debugfs/i= node.c ---- linux-2.6.38.3/fs/debugfs/inode.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/debugfs/inode.c 2011-04-17 15:57:32.000000000 -040= 0 -@@ -130,7 +130,7 @@ static inline int debugfs_positive(struc -=20 - static int debug_fill_super(struct super_block *sb, void *data, int sil= ent) - { -- static struct tree_descr debug_files[] =3D {{""}}; -+ static struct tree_descr debug_files[] =3D {{"", NULL, 0}}; -=20 - return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); - } -diff -urNp linux-2.6.38.3/fs/dlm/lockspace.c linux-2.6.38.3/fs/dlm/locks= pace.c ---- linux-2.6.38.3/fs/dlm/lockspace.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/dlm/lockspace.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/fs/dlm/lockspace.c linux-2.6.38.4/fs/dlm/locks= pace.c +--- linux-2.6.38.4/fs/dlm/lockspace.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/fs/dlm/lockspace.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset, return 0; } @@ -31367,9 +30212,9 @@ diff -urNp linux-2.6.38.3/fs/dlm/lockspace.c linu= x-2.6.38.3/fs/dlm/lockspace.c .uevent =3D dlm_uevent, }; =20 -diff -urNp linux-2.6.38.3/fs/ecryptfs/inode.c linux-2.6.38.3/fs/ecryptfs= /inode.c ---- linux-2.6.38.3/fs/ecryptfs/inode.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/fs/ecryptfs/inode.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/fs/ecryptfs/inode.c linux-2.6.38.4/fs/ecryptfs= /inode.c +--- linux-2.6.38.4/fs/ecryptfs/inode.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/fs/ecryptfs/inode.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struc old_fs =3D get_fs(); set_fs(get_ds()); @@ -31397,9 +30242,9 @@ diff -urNp linux-2.6.38.3/fs/ecryptfs/inode.c lin= ux-2.6.38.3/fs/ecryptfs/inode.c if (!IS_ERR(buf)) { /* Free the char* */ kfree(buf); -diff -urNp linux-2.6.38.3/fs/ecryptfs/miscdev.c linux-2.6.38.3/fs/ecrypt= fs/miscdev.c ---- linux-2.6.38.3/fs/ecryptfs/miscdev.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/fs/ecryptfs/miscdev.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/fs/ecryptfs/miscdev.c linux-2.6.38.4/fs/ecrypt= fs/miscdev.c +--- linux-2.6.38.4/fs/ecryptfs/miscdev.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/fs/ecryptfs/miscdev.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -328,7 +328,7 @@ check_list: goto out_unlock_msg_ctx; i =3D 5; @@ -31409,9 +30254,9 @@ diff -urNp linux-2.6.38.3/fs/ecryptfs/miscdev.c l= inux-2.6.38.3/fs/ecryptfs/miscd goto out_unlock_msg_ctx; i +=3D packet_length_size; if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size)) -diff -urNp linux-2.6.38.3/fs/exec.c linux-2.6.38.3/fs/exec.c ---- linux-2.6.38.3/fs/exec.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/exec.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/exec.c linux-2.6.38.4/fs/exec.c +--- linux-2.6.38.4/fs/exec.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/exec.c 2011-04-17 15:57:32.000000000 -0400 @@ -55,12 +55,24 @@ #include #include @@ -31948,9 +30793,9 @@ diff -urNp linux-2.6.38.3/fs/exec.c linux-2.6.38.= 3/fs/exec.c if (ispipe) { int dump_count; char **helper_argv; -diff -urNp linux-2.6.38.3/fs/ext2/balloc.c linux-2.6.38.3/fs/ext2/balloc= .c ---- linux-2.6.38.3/fs/ext2/balloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext2/balloc.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ext2/balloc.c linux-2.6.38.4/fs/ext2/balloc= .c +--- linux-2.6.38.4/fs/ext2/balloc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ext2/balloc.c 2011-04-17 15:57:32.000000000 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e =20 free_blocks =3D percpu_counter_read_positive(&sbi->s_freeblocks_counte= r); @@ -31960,23 +30805,9 @@ diff -urNp linux-2.6.38.3/fs/ext2/balloc.c linux= -2.6.38.3/fs/ext2/balloc.c sbi->s_resuid !=3D current_fsuid() && (sbi->s_resgid =3D=3D 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.38.3/fs/ext2/xattr.c linux-2.6.38.3/fs/ext2/xattr.c ---- linux-2.6.38.3/fs/ext2/xattr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext2/xattr.c 2011-04-17 15:57:32.000000000 -0400 -@@ -86,8 +86,8 @@ - printk("\n"); \ - } while (0) - #else --# define ea_idebug(f...) --# define ea_bdebug(f...) -+# define ea_idebug(inode, f...) do {} while (0) -+# define ea_bdebug(bh, f...) do {} while (0) - #endif -=20 - static int ext2_xattr_set2(struct inode *, struct buffer_head *, -diff -urNp linux-2.6.38.3/fs/ext3/balloc.c linux-2.6.38.3/fs/ext3/balloc= .c ---- linux-2.6.38.3/fs/ext3/balloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext3/balloc.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ext3/balloc.c linux-2.6.38.4/fs/ext3/balloc= .c +--- linux-2.6.38.4/fs/ext3/balloc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ext3/balloc.c 2011-04-17 15:57:32.000000000 -0400 @@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e =20 free_blocks =3D percpu_counter_read_positive(&sbi->s_freeblocks_counte= r); @@ -31986,35 +30817,9 @@ diff -urNp linux-2.6.38.3/fs/ext3/balloc.c linux= -2.6.38.3/fs/ext3/balloc.c sbi->s_resuid !=3D current_fsuid() && (sbi->s_resgid =3D=3D 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.38.3/fs/ext3/namei.c linux-2.6.38.3/fs/ext3/namei.c ---- linux-2.6.38.3/fs/ext3/namei.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.3/fs/ext3/namei.c 2011-04-17 15:57:32.000000000 -0400 -@@ -1159,7 +1159,7 @@ static struct ext3_dir_entry_2 *do_split - char *data1 =3D (*bh)->b_data, *data2; - unsigned split, move, size; - struct ext3_dir_entry_2 *de =3D NULL, *de2; -- int err =3D 0, i; -+ int i, err =3D 0; -=20 - bh2 =3D ext3_append (handle, dir, &newblock, &err); - if (!(bh2)) { -diff -urNp linux-2.6.38.3/fs/ext3/xattr.c linux-2.6.38.3/fs/ext3/xattr.c ---- linux-2.6.38.3/fs/ext3/xattr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext3/xattr.c 2011-04-17 15:57:32.000000000 -0400 -@@ -89,8 +89,8 @@ - printk("\n"); \ - } while (0) - #else --# define ea_idebug(f...) --# define ea_bdebug(f...) -+# define ea_idebug(f...) do {} while (0) -+# define ea_bdebug(f...) do {} while (0) - #endif -=20 - static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.38.3/fs/ext4/balloc.c linux-2.6.38.3/fs/ext4/balloc= .c ---- linux-2.6.38.3/fs/ext4/balloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext4/balloc.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ext4/balloc.c linux-2.6.38.4/fs/ext4/balloc= .c +--- linux-2.6.38.4/fs/ext4/balloc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ext4/balloc.c 2011-04-17 15:57:32.000000000 -0400 @@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid =3D=3D current_fsuid() || @@ -32024,9 +30829,9 @@ diff -urNp linux-2.6.38.3/fs/ext4/balloc.c linux-= 2.6.38.3/fs/ext4/balloc.c if (free_blocks >=3D (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.38.3/fs/ext4/ext4.h linux-2.6.38.3/fs/ext4/ext4.h ---- linux-2.6.38.3/fs/ext4/ext4.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext4/ext4.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ext4/ext4.h linux-2.6.38.4/fs/ext4/ext4.h +--- linux-2.6.38.4/fs/ext4/ext4.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ext4/ext4.h 2011-04-17 15:57:32.000000000 -0400 @@ -1166,19 +1166,19 @@ struct ext4_sb_info { unsigned long s_mb_last_start; =20 @@ -32057,9 +30862,9 @@ diff -urNp linux-2.6.38.3/fs/ext4/ext4.h linux-2.= 6.38.3/fs/ext4/ext4.h atomic_t s_lock_busy; =20 /* locality groups */ -diff -urNp linux-2.6.38.3/fs/ext4/mballoc.c linux-2.6.38.3/fs/ext4/mball= oc.c ---- linux-2.6.38.3/fs/ext4/mballoc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext4/mballoc.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ext4/mballoc.c linux-2.6.38.4/fs/ext4/mball= oc.c +--- linux-2.6.38.4/fs/ext4/mballoc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ext4/mballoc.c 2011-04-17 15:57:32.000000000 -0400 @@ -1846,7 +1846,7 @@ void ext4_mb_simple_scan_group(struct ex BUG_ON(ac->ac_b_ex.fe_len !=3D ac->ac_g_ex.fe_len); =20 @@ -32173,35 +30978,9 @@ diff -urNp linux-2.6.38.3/fs/ext4/mballoc.c linu= x-2.6.38.3/fs/ext4/mballoc.c trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len); =20 return 0; -diff -urNp linux-2.6.38.3/fs/ext4/namei.c linux-2.6.38.3/fs/ext4/namei.c ---- linux-2.6.38.3/fs/ext4/namei.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext4/namei.c 2011-04-17 15:57:32.000000000 -0400 -@@ -1161,7 +1161,7 @@ static struct ext4_dir_entry_2 *do_split - char *data1 =3D (*bh)->b_data, *data2; - unsigned split, move, size; - struct ext4_dir_entry_2 *de =3D NULL, *de2; -- int err =3D 0, i; -+ int i, err =3D 0; -=20 - bh2 =3D ext4_append (handle, dir, &newblock, &err); - if (!(bh2)) { -diff -urNp linux-2.6.38.3/fs/ext4/xattr.c linux-2.6.38.3/fs/ext4/xattr.c ---- linux-2.6.38.3/fs/ext4/xattr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ext4/xattr.c 2011-04-17 15:57:32.000000000 -0400 -@@ -82,8 +82,8 @@ - printk("\n"); \ - } while (0) - #else --# define ea_idebug(f...) --# define ea_bdebug(f...) -+# define ea_idebug(inode, f...) do {} while (0) -+# define ea_bdebug(bh, f...) do {} while (0) - #endif -=20 - static void ext4_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.38.3/fs/fcntl.c linux-2.6.38.3/fs/fcntl.c ---- linux-2.6.38.3/fs/fcntl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/fcntl.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/fcntl.c linux-2.6.38.4/fs/fcntl.c +--- linux-2.6.38.4/fs/fcntl.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/fcntl.c 2011-04-17 15:57:32.000000000 -0400 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct if (err) return err; @@ -32239,9 +31018,9 @@ diff -urNp linux-2.6.38.3/fs/fcntl.c linux-2.6.38= .3/fs/fcntl.c )); =20 fasync_cache =3D kmem_cache_create("fasync_cache", -diff -urNp linux-2.6.38.3/fs/fifo.c linux-2.6.38.3/fs/fifo.c ---- linux-2.6.38.3/fs/fifo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/fifo.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/fifo.c linux-2.6.38.4/fs/fifo.c +--- linux-2.6.38.4/fs/fifo.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/fifo.c 2011-04-17 15:57:32.000000000 -0400 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode */ filp->f_op =3D &read_pipefifo_fops; @@ -32312,9 +31091,9 @@ diff -urNp linux-2.6.38.3/fs/fifo.c linux-2.6.38.= 3/fs/fifo.c free_pipe_info(inode); =20 err_nocleanup: -diff -urNp linux-2.6.38.3/fs/file.c linux-2.6.38.3/fs/file.c ---- linux-2.6.38.3/fs/file.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/file.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/file.c linux-2.6.38.4/fs/file.c +--- linux-2.6.38.4/fs/file.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/file.c 2011-04-17 15:57:32.000000000 -0400 @@ -14,6 +14,7 @@ #include #include @@ -32331,9 +31110,9 @@ diff -urNp linux-2.6.38.3/fs/file.c linux-2.6.38.= 3/fs/file.c if (nr >=3D rlimit(RLIMIT_NOFILE)) return -EMFILE; =20 -diff -urNp linux-2.6.38.3/fs/filesystems.c linux-2.6.38.3/fs/filesystems= .c ---- linux-2.6.38.3/fs/filesystems.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/filesystems.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/filesystems.c linux-2.6.38.4/fs/filesystems= .c +--- linux-2.6.38.4/fs/filesystems.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/filesystems.c 2011-04-17 15:57:32.000000000 -0400 @@ -275,7 +275,12 @@ struct file_system_type *get_fs_type(con int len =3D dot ? dot - name : strlen(name); =20 @@ -32347,9 +31126,9 @@ diff -urNp linux-2.6.38.3/fs/filesystems.c linux-= 2.6.38.3/fs/filesystems.c fs =3D __get_fs_type(name, len); =20 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { -diff -urNp linux-2.6.38.3/fs/fs_struct.c linux-2.6.38.3/fs/fs_struct.c ---- linux-2.6.38.3/fs/fs_struct.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/fs_struct.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/fs_struct.c linux-2.6.38.4/fs/fs_struct.c +--- linux-2.6.38.4/fs/fs_struct.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/fs_struct.c 2011-04-17 15:57:32.000000000 -0400 @@ -4,6 +4,7 @@ #include #include @@ -32439,21 +31218,9 @@ diff -urNp linux-2.6.38.3/fs/fs_struct.c linux-2= .6.38.3/fs/fs_struct.c spin_unlock(&fs->lock); =20 task_unlock(current); -diff -urNp linux-2.6.38.3/fs/fuse/control.c linux-2.6.38.3/fs/fuse/contr= ol.c ---- linux-2.6.38.3/fs/fuse/control.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/fuse/control.c 2011-04-17 15:57:32.000000000 -0400 -@@ -298,7 +298,7 @@ void fuse_ctl_remove_conn(struct fuse_co -=20 - static int fuse_ctl_fill_super(struct super_block *sb, void *data, int = silent) - { -- struct tree_descr empty_descr =3D {""}; -+ struct tree_descr empty_descr =3D {"", NULL, 0}; - struct fuse_conn *fc; - int err; -=20 -diff -urNp linux-2.6.38.3/fs/fuse/cuse.c linux-2.6.38.3/fs/fuse/cuse.c ---- linux-2.6.38.3/fs/fuse/cuse.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/fuse/cuse.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/fuse/cuse.c linux-2.6.38.4/fs/fuse/cuse.c +--- linux-2.6.38.4/fs/fuse/cuse.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/fuse/cuse.c 2011-04-17 15:57:32.000000000 -0400 @@ -530,8 +530,18 @@ static int cuse_channel_release(struct i return rc; } @@ -32488,9 +31255,9 @@ diff -urNp linux-2.6.38.3/fs/fuse/cuse.c linux-2.= 6.38.3/fs/fuse/cuse.c cuse_class =3D class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.38.3/fs/fuse/dev.c linux-2.6.38.3/fs/fuse/dev.c ---- linux-2.6.38.3/fs/fuse/dev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/fuse/dev.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/fuse/dev.c linux-2.6.38.4/fs/fuse/dev.c +--- linux-2.6.38.4/fs/fuse/dev.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/fuse/dev.c 2011-04-17 15:57:32.000000000 -0400 @@ -1183,7 +1183,7 @@ static ssize_t fuse_dev_do_read(struct f return err; } @@ -32572,9 +31339,9 @@ diff -urNp linux-2.6.38.3/fs/fuse/dev.c linux-2.6= .38.3/fs/fuse/dev.c const struct file_operations fuse_dev_operations =3D { .owner =3D THIS_MODULE, .llseek =3D no_llseek, -diff -urNp linux-2.6.38.3/fs/fuse/dir.c linux-2.6.38.3/fs/fuse/dir.c ---- linux-2.6.38.3/fs/fuse/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/fuse/dir.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/fuse/dir.c linux-2.6.38.4/fs/fuse/dir.c +--- linux-2.6.38.4/fs/fuse/dir.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/fuse/dir.c 2011-04-17 15:57:32.000000000 -0400 @@ -1133,7 +1133,7 @@ static char *read_link(struct dentry *de return link; } @@ -32584,9 +31351,9 @@ diff -urNp linux-2.6.38.3/fs/fuse/dir.c linux-2.6= .38.3/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.38.3/fs/fuse/fuse_i.h linux-2.6.38.3/fs/fuse/fuse_i= .h ---- linux-2.6.38.3/fs/fuse/fuse_i.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/fuse/fuse_i.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/fuse/fuse_i.h linux-2.6.38.4/fs/fuse/fuse_i= .h +--- linux-2.6.38.4/fs/fuse/fuse_i.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/fuse/fuse_i.h 2011-04-17 15:57:32.000000000 -0400 @@ -541,6 +541,16 @@ extern const struct file_operations fuse =20 extern const struct dentry_operations fuse_dentry_operations; @@ -32604,69 +31371,9 @@ diff -urNp linux-2.6.38.3/fs/fuse/fuse_i.h linux= -2.6.38.3/fs/fuse/fuse_i.h /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.38.3/fs/hfs/inode.c linux-2.6.38.3/fs/hfs/inode.c ---- linux-2.6.38.3/fs/hfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/hfs/inode.c 2011-04-17 15:57:32.000000000 -0400 -@@ -447,7 +447,7 @@ int hfs_write_inode(struct inode *inode, -=20 - if (S_ISDIR(main_inode->i_mode)) { - if (fd.entrylength < sizeof(struct hfs_cat_dir)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, - sizeof(struct hfs_cat_dir)); - if (rec.type !=3D HFS_CDR_DIR || -@@ -468,7 +468,7 @@ int hfs_write_inode(struct inode *inode, - sizeof(struct hfs_cat_file)); - } else { - if (fd.entrylength < sizeof(struct hfs_cat_file)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, - sizeof(struct hfs_cat_file)); - if (rec.type !=3D HFS_CDR_FIL || -diff -urNp linux-2.6.38.3/fs/hfsplus/inode.c linux-2.6.38.3/fs/hfsplus/i= node.c ---- linux-2.6.38.3/fs/hfsplus/inode.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/hfsplus/inode.c 2011-04-17 15:57:32.000000000 -040= 0 -@@ -498,7 +498,7 @@ int hfsplus_cat_read_inode(struct inode=20 - struct hfsplus_cat_folder *folder =3D &entry.folder; -=20 - if (fd->entrylength < sizeof(struct hfsplus_cat_folder)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, - sizeof(struct hfsplus_cat_folder)); - hfsplus_get_perms(inode, &folder->permissions, 1); -@@ -515,7 +515,7 @@ int hfsplus_cat_read_inode(struct inode=20 - struct hfsplus_cat_file *file =3D &entry.file; -=20 - if (fd->entrylength < sizeof(struct hfsplus_cat_file)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, - sizeof(struct hfsplus_cat_file)); -=20 -@@ -572,7 +572,7 @@ int hfsplus_cat_write_inode(struct inode - struct hfsplus_cat_folder *folder =3D &entry.folder; -=20 - if (fd.entrylength < sizeof(struct hfsplus_cat_folder)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, - sizeof(struct hfsplus_cat_folder)); - /* simple node checks? */ -@@ -594,7 +594,7 @@ int hfsplus_cat_write_inode(struct inode - struct hfsplus_cat_file *file =3D &entry.file; -=20 - if (fd.entrylength < sizeof(struct hfsplus_cat_file)) -- /* panic? */; -+ {/* panic? */} - hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, - sizeof(struct hfsplus_cat_file)); - hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.38.3/fs/hugetlbfs/inode.c linux-2.6.38.3/fs/hugetlb= fs/inode.c ---- linux-2.6.38.3/fs/hugetlbfs/inode.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/fs/hugetlbfs/inode.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/fs/hugetlbfs/inode.c linux-2.6.38.4/fs/hugetlb= fs/inode.c +--- linux-2.6.38.4/fs/hugetlbfs/inode.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/fs/hugetlbfs/inode.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs .kill_sb =3D kill_litter_super, }; @@ -32676,113 +31383,23 @@ diff -urNp linux-2.6.38.3/fs/hugetlbfs/inode.c= linux-2.6.38.3/fs/hugetlbfs/inode =20 static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.38.3/fs/jffs2/debug.h linux-2.6.38.3/fs/jffs2/debug= .h ---- linux-2.6.38.3/fs/jffs2/debug.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/jffs2/debug.h 2011-04-17 15:57:32.000000000 -0400 -@@ -53,13 +53,13 @@ - #if CONFIG_JFFS2_FS_DEBUG > 0 - #define D1(x) x - #else --#define D1(x) -+#define D1(x) do {} while (0); - #endif -=20 - #if CONFIG_JFFS2_FS_DEBUG > 1 - #define D2(x) x - #else --#define D2(x) -+#define D2(x) do {} while (0); - #endif -=20 - /* The prefixes of JFFS2 messages */ -@@ -115,73 +115,73 @@ - #ifdef JFFS2_DBG_READINODE_MESSAGES - #define dbg_readinode(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_readinode(fmt, ...) -+#define dbg_readinode(fmt, ...) do {} while (0) - #endif - #ifdef JFFS2_DBG_READINODE2_MESSAGES - #define dbg_readinode2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_readinode2(fmt, ...) -+#define dbg_readinode2(fmt, ...) do {} while (0) - #endif -=20 - /* Fragtree build debugging messages */ - #ifdef JFFS2_DBG_FRAGTREE_MESSAGES - #define dbg_fragtree(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_fragtree(fmt, ...) -+#define dbg_fragtree(fmt, ...) do {} while (0) - #endif - #ifdef JFFS2_DBG_FRAGTREE2_MESSAGES - #define dbg_fragtree2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_fragtree2(fmt, ...) -+#define dbg_fragtree2(fmt, ...) do {} while (0) - #endif -=20 - /* Directory entry list manilulation debugging messages */ - #ifdef JFFS2_DBG_DENTLIST_MESSAGES - #define dbg_dentlist(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_dentlist(fmt, ...) -+#define dbg_dentlist(fmt, ...) do {} while (0) - #endif +diff -urNp linux-2.6.38.4/fs/inode.c linux-2.6.38.4/fs/inode.c +--- linux-2.6.38.4/fs/inode.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/inode.c 2011-04-23 12:47:41.000000000 -0400 +@@ -801,8 +801,8 @@ unsigned int get_next_ino(void) =20 - /* Print the messages about manipulating node_refs */ - #ifdef JFFS2_DBG_NODEREF_MESSAGES - #define dbg_noderef(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_noderef(fmt, ...) -+#define dbg_noderef(fmt, ...) do {} while (0) - #endif -=20 - /* Manipulations with the list of inodes (JFFS2 inocache) */ - #ifdef JFFS2_DBG_INOCACHE_MESSAGES - #define dbg_inocache(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_inocache(fmt, ...) -+#define dbg_inocache(fmt, ...) do {} while (0) - #endif -=20 - /* Summary debugging messages */ - #ifdef JFFS2_DBG_SUMMARY_MESSAGES - #define dbg_summary(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_summary(fmt, ...) -+#define dbg_summary(fmt, ...) do {} while (0) - #endif -=20 - /* File system build messages */ - #ifdef JFFS2_DBG_FSBUILD_MESSAGES - #define dbg_fsbuild(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_fsbuild(fmt, ...) -+#define dbg_fsbuild(fmt, ...) do {} while (0) - #endif -=20 - /* Watch the object allocations */ - #ifdef JFFS2_DBG_MEMALLOC_MESSAGES - #define dbg_memalloc(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_memalloc(fmt, ...) -+#define dbg_memalloc(fmt, ...) do {} while (0) - #endif + #ifdef CONFIG_SMP + if (unlikely((res & (LAST_INO_BATCH-1)) =3D=3D 0)) { +- static atomic_t shared_last_ino; +- int next =3D atomic_add_return(LAST_INO_BATCH, &shared_last_ino); ++ static atomic_unchecked_t shared_last_ino; ++ int next =3D atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last= _ino); =20 - /* Watch the XATTR subsystem */ - #ifdef JFFS2_DBG_XATTR_MESSAGES - #define dbg_xattr(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) - #else --#define dbg_xattr(fmt, ...) -+#define dbg_xattr(fmt, ...) do {} while (0) - #endif=20 -=20 - /* "Sanity" checks */ -diff -urNp linux-2.6.38.3/fs/jffs2/erase.c linux-2.6.38.3/fs/jffs2/erase= .c ---- linux-2.6.38.3/fs/jffs2/erase.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/jffs2/erase.c 2011-04-17 15:57:32.000000000 -0400 + res =3D next - LAST_INO_BATCH; + } +diff -urNp linux-2.6.38.4/fs/jffs2/erase.c linux-2.6.38.4/fs/jffs2/erase= .c +--- linux-2.6.38.4/fs/jffs2/erase.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/jffs2/erase.c 2011-04-17 15:57:32.000000000 -0400 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker =3D { .magic =3D cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -32793,40 +31410,9 @@ diff -urNp linux-2.6.38.3/fs/jffs2/erase.c linux= -2.6.38.3/fs/jffs2/erase.c }; =20 jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.38.3/fs/jffs2/summary.h linux-2.6.38.3/fs/jffs2/sum= mary.h ---- linux-2.6.38.3/fs/jffs2/summary.h 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/jffs2/summary.h 2011-04-17 15:57:32.000000000 -040= 0 -@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ -=20 - #define jffs2_sum_active() (0) - #define jffs2_sum_init(a) (0) --#define jffs2_sum_exit(a) --#define jffs2_sum_disable_collecting(a) -+#define jffs2_sum_exit(a) do {} while (0) -+#define jffs2_sum_disable_collecting(a) do {} while (0) - #define jffs2_sum_is_disabled(a) (0) --#define jffs2_sum_reset_collected(a) -+#define jffs2_sum_reset_collected(a) do {} while (0) - #define jffs2_sum_add_kvec(a,b,c,d) (0) --#define jffs2_sum_move_collected(a,b) -+#define jffs2_sum_move_collected(a,b) do {} while (0) - #define jffs2_sum_write_sumnode(a) (0) --#define jffs2_sum_add_padding_mem(a,b) --#define jffs2_sum_add_inode_mem(a,b,c) --#define jffs2_sum_add_dirent_mem(a,b,c) --#define jffs2_sum_add_xattr_mem(a,b,c) --#define jffs2_sum_add_xref_mem(a,b,c) -+#define jffs2_sum_add_padding_mem(a,b) do {} while (0) -+#define jffs2_sum_add_inode_mem(a,b,c) do {} while (0) -+#define jffs2_sum_add_dirent_mem(a,b,c) do {} while (0) -+#define jffs2_sum_add_xattr_mem(a,b,c) do {} while (0) -+#define jffs2_sum_add_xref_mem(a,b,c) do {} while (0) - #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) -=20 - #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.38.3/fs/jffs2/wbuf.c linux-2.6.38.3/fs/jffs2/wbuf.c ---- linux-2.6.38.3/fs/jffs2/wbuf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/jffs2/wbuf.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/jffs2/wbuf.c linux-2.6.38.4/fs/jffs2/wbuf.c +--- linux-2.6.38.4/fs/jffs2/wbuf.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/jffs2/wbuf.c 2011-04-17 15:57:32.000000000 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic =3D constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -32837,9 +31423,9 @@ diff -urNp linux-2.6.38.3/fs/jffs2/wbuf.c linux-2= .6.38.3/fs/jffs2/wbuf.c }; =20 /* -diff -urNp linux-2.6.38.3/fs/Kconfig.binfmt linux-2.6.38.3/fs/Kconfig.bi= nfmt ---- linux-2.6.38.3/fs/Kconfig.binfmt 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/Kconfig.binfmt 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/Kconfig.binfmt linux-2.6.38.4/fs/Kconfig.bi= nfmt +--- linux-2.6.38.4/fs/Kconfig.binfmt 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/Kconfig.binfmt 2011-04-17 15:57:32.000000000 -0400 @@ -86,7 +86,7 @@ config HAVE_AOUT =20 config BINFMT_AOUT @@ -32849,9 +31435,9 @@ diff -urNp linux-2.6.38.3/fs/Kconfig.binfmt linux= -2.6.38.3/fs/Kconfig.binfmt ---help--- A.out (Assembler.OUTput) is a set of formats for libraries and executables used in the earliest versions of UNIX. Linux used -diff -urNp linux-2.6.38.3/fs/libfs.c linux-2.6.38.3/fs/libfs.c ---- linux-2.6.38.3/fs/libfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/libfs.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/libfs.c linux-2.6.38.4/fs/libfs.c +--- linux-2.6.38.4/fs/libfs.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/libfs.c 2011-04-17 15:57:32.000000000 -0400 @@ -138,6 +138,8 @@ int dcache_readdir(struct file * filp, v struct dentry *dentry =3D filp->f_path.dentry; struct dentry *cursor =3D filp->private_data; @@ -32875,9 +31461,9 @@ diff -urNp linux-2.6.38.3/fs/libfs.c linux-2.6.38= .3/fs/libfs.c next->d_name.len, filp->f_pos,=20 next->d_inode->i_ino,=20 dt_type(next->d_inode)) < 0) -diff -urNp linux-2.6.38.3/fs/lockd/svc.c linux-2.6.38.3/fs/lockd/svc.c ---- linux-2.6.38.3/fs/lockd/svc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/lockd/svc.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/lockd/svc.c linux-2.6.38.4/fs/lockd/svc.c +--- linux-2.6.38.4/fs/lockd/svc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/lockd/svc.c 2011-04-17 15:57:32.000000000 -0400 @@ -41,7 +41,7 @@ =20 static struct svc_program nlmsvc_program; @@ -32887,9 +31473,9 @@ diff -urNp linux-2.6.38.3/fs/lockd/svc.c linux-2.= 6.38.3/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); =20 static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.38.3/fs/locks.c linux-2.6.38.3/fs/locks.c ---- linux-2.6.38.3/fs/locks.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/locks.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/locks.c linux-2.6.38.4/fs/locks.c +--- linux-2.6.38.4/fs/locks.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/locks.c 2011-04-17 15:57:32.000000000 -0400 @@ -2044,16 +2044,16 @@ void locks_remove_flock(struct file *fil return; =20 @@ -32911,9 +31497,9 @@ diff -urNp linux-2.6.38.3/fs/locks.c linux-2.6.38= .3/fs/locks.c } =20 lock_flocks(); -diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c ---- linux-2.6.38.3/fs/namei.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/namei.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/namei.c linux-2.6.38.4/fs/namei.c +--- linux-2.6.38.4/fs/namei.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/fs/namei.c 2011-04-22 19:21:23.000000000 -0400 @@ -226,14 +226,6 @@ int generic_permission(struct inode *ino return ret; =20 @@ -32954,7 +31540,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c goto ok; =20 return ret; -@@ -775,7 +776,7 @@ __do_follow_link(const struct path *link +@@ -776,7 +777,7 @@ __do_follow_link(const struct path *link *p =3D dentry->d_inode->i_op->follow_link(dentry, nd); error =3D PTR_ERR(*p); if (!IS_ERR(*p)) { @@ -32963,7 +31549,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c error =3D 0; if (s) error =3D __vfs_follow_link(nd, s); -@@ -814,6 +815,13 @@ static inline int do_follow_link(struct=20 +@@ -815,6 +816,13 @@ static inline int do_follow_link(struct=20 err =3D security_inode_follow_link(path->dentry, nd); if (err) goto loop; @@ -32977,7 +31563,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c current->link_count++; current->total_link_count++; nd->depth++; -@@ -1505,13 +1513,36 @@ return_reval: +@@ -1506,13 +1514,36 @@ return_reval: return_base: if (nameidata_drop_rcu_last_maybe(nd)) return -ECHILD; @@ -33014,7 +31600,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c path_put(&nd->path); return_err: return err; -@@ -1738,6 +1769,9 @@ static int do_path_lookup(int dfd, const +@@ -1739,6 +1770,9 @@ static int do_path_lookup(int dfd, const } =20 if (likely(!retval)) { @@ -33024,7 +31610,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c if (unlikely(!audit_dummy_context())) { if (nd->path.dentry && nd->inode) audit_inode(name, nd->path.dentry); -@@ -2078,6 +2112,30 @@ int vfs_create(struct inode *dir, struct +@@ -2079,6 +2113,30 @@ int vfs_create(struct inode *dir, struct return error; } =20 @@ -33055,7 +31641,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c int may_open(struct path *path, int acc_mode, int flag) { struct dentry *dentry =3D path->dentry; -@@ -2126,7 +2184,27 @@ int may_open(struct path *path, int acc_ +@@ -2127,7 +2185,27 @@ int may_open(struct path *path, int acc_ /* * Ensure there are no outstanding leases on the file. */ @@ -33084,7 +31670,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c } =20 static int handle_truncate(struct file *filp) -@@ -2161,6 +2239,12 @@ static int __open_namei_create(struct na +@@ -2162,6 +2240,12 @@ static int __open_namei_create(struct na { int error; struct dentry *dir =3D nd->path.dentry; @@ -33097,7 +31683,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c =20 if (!IS_POSIXACL(dir->d_inode)) mode &=3D ~current_umask(); -@@ -2168,6 +2252,8 @@ static int __open_namei_create(struct na +@@ -2169,6 +2253,8 @@ static int __open_namei_create(struct na if (error) goto out_unlock; error =3D vfs_create(dir->d_inode, path->dentry, mode, nd); @@ -33106,7 +31692,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c out_unlock: mutex_unlock(&dir->d_inode->i_mutex); dput(nd->path.dentry); -@@ -2179,30 +2265,6 @@ out_unlock: +@@ -2180,30 +2266,6 @@ out_unlock: return may_open(&nd->path, 0, open_flag & ~O_TRUNC); } =20 @@ -33137,7 +31723,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c static int open_will_truncate(int flag, struct inode *inode) { /* -@@ -2273,6 +2335,7 @@ static struct file *do_last(struct namei +@@ -2274,6 +2336,7 @@ static struct file *do_last(struct namei int mode, const char *pathname) { struct dentry *dir =3D nd->path.dentry; @@ -33145,7 +31731,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c struct file *filp; int error =3D -EISDIR; =20 -@@ -2351,6 +2414,14 @@ static struct file *do_last(struct namei +@@ -2352,6 +2415,14 @@ static struct file *do_last(struct namei /* * It already exists. */ @@ -33160,7 +31746,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c mutex_unlock(&dir->d_inode->i_mutex); audit_inode(pathname, path->dentry); =20 -@@ -2534,6 +2605,11 @@ reval: +@@ -2535,6 +2606,11 @@ reval: error =3D security_inode_follow_link(link.dentry, &nd); if (error) goto exit_dput; @@ -33172,7 +31758,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c error =3D __do_follow_link(&link, &nd, &cookie); if (unlikely(error)) { if (!IS_ERR(cookie) && linki->i_op->put_link) -@@ -2704,6 +2780,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const +@@ -2705,6 +2781,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const error =3D may_mknod(mode); if (error) goto out_dput; @@ -33190,7 +31776,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c error =3D mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -2724,6 +2811,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const +@@ -2725,6 +2812,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const } out_drop_write: mnt_drop_write(nd.path.mnt); @@ -33200,7 +31786,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c out_dput: dput(dentry); out_unlock: -@@ -2776,6 +2866,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -2777,6 +2867,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const if (IS_ERR(dentry)) goto out_unlock; =20 @@ -33212,7 +31798,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c if (!IS_POSIXACL(nd.path.dentry->d_inode)) mode &=3D ~current_umask(); error =3D mnt_want_write(nd.path.mnt); -@@ -2787,6 +2882,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -2788,6 +2883,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const error =3D vfs_mkdir(nd.path.dentry->d_inode, dentry, mode); out_drop_write: mnt_drop_write(nd.path.mnt); @@ -33223,7 +31809,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c out_dput: dput(dentry); out_unlock: -@@ -2866,6 +2965,8 @@ static long do_rmdir(int dfd, const char +@@ -2867,6 +2966,8 @@ static long do_rmdir(int dfd, const char char * name; struct dentry *dentry; struct nameidata nd; @@ -33232,7 +31818,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c =20 error =3D user_path_parent(dfd, pathname, &nd, &name); if (error) -@@ -2890,6 +2991,19 @@ static long do_rmdir(int dfd, const char +@@ -2891,6 +2992,19 @@ static long do_rmdir(int dfd, const char error =3D PTR_ERR(dentry); if (IS_ERR(dentry)) goto exit2; @@ -33252,7 +31838,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c error =3D mnt_want_write(nd.path.mnt); if (error) goto exit3; -@@ -2897,6 +3011,8 @@ static long do_rmdir(int dfd, const char +@@ -2898,6 +3012,8 @@ static long do_rmdir(int dfd, const char if (error) goto exit4; error =3D vfs_rmdir(nd.path.dentry->d_inode, dentry); @@ -33261,7 +31847,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c exit4: mnt_drop_write(nd.path.mnt); exit3: -@@ -2959,6 +3075,8 @@ static long do_unlinkat(int dfd, const c +@@ -2960,6 +3076,8 @@ static long do_unlinkat(int dfd, const c struct dentry *dentry; struct nameidata nd; struct inode *inode =3D NULL; @@ -33270,7 +31856,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c =20 error =3D user_path_parent(dfd, pathname, &nd, &name); if (error) -@@ -2978,8 +3096,17 @@ static long do_unlinkat(int dfd, const c +@@ -2979,8 +3097,17 @@ static long do_unlinkat(int dfd, const c if (nd.last.name[nd.last.len]) goto slashes; inode =3D dentry->d_inode; @@ -33289,7 +31875,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c error =3D mnt_want_write(nd.path.mnt); if (error) goto exit2; -@@ -2987,6 +3114,8 @@ static long do_unlinkat(int dfd, const c +@@ -2988,6 +3115,8 @@ static long do_unlinkat(int dfd, const c if (error) goto exit3; error =3D vfs_unlink(nd.path.dentry->d_inode, dentry); @@ -33298,7 +31884,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c exit3: mnt_drop_write(nd.path.mnt); exit2: -@@ -3064,6 +3193,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ +@@ -3065,6 +3194,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ if (IS_ERR(dentry)) goto out_unlock; =20 @@ -33310,7 +31896,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c error =3D mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -3071,6 +3205,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ +@@ -3072,6 +3206,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ if (error) goto out_drop_write; error =3D vfs_symlink(nd.path.dentry->d_inode, dentry, from); @@ -33319,7 +31905,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c out_drop_write: mnt_drop_write(nd.path.mnt); out_dput: -@@ -3163,6 +3299,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con +@@ -3164,6 +3300,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con error =3D PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) goto out_unlock; @@ -33340,7 +31926,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c error =3D mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -3170,6 +3320,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con +@@ -3171,6 +3321,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con if (error) goto out_drop_write; error =3D vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentr= y); @@ -33349,7 +31935,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c out_drop_write: mnt_drop_write(nd.path.mnt); out_dput: -@@ -3403,6 +3555,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -3404,6 +3556,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c if (new_dentry =3D=3D trap) goto exit5; =20 @@ -33362,7 +31948,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c error =3D mnt_want_write(oldnd.path.mnt); if (error) goto exit5; -@@ -3412,6 +3570,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -3413,6 +3571,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c goto exit6; error =3D vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry); @@ -33372,7 +31958,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -@@ -3437,6 +3598,8 @@ SYSCALL_DEFINE2(rename, const char __use +@@ -3438,6 +3599,8 @@ SYSCALL_DEFINE2(rename, const char __use =20 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen= , const char *link) { @@ -33381,7 +31967,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c int len; =20 len =3D PTR_ERR(link); -@@ -3446,7 +3609,14 @@ int vfs_readlink(struct dentry *dentry,=20 +@@ -3447,7 +3610,14 @@ int vfs_readlink(struct dentry *dentry,=20 len =3D strlen(link); if (len > (unsigned) buflen) len =3D buflen; @@ -33397,9 +31983,9 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38= .3/fs/namei.c len =3D -EFAULT; out: return len; -diff -urNp linux-2.6.38.3/fs/namespace.c linux-2.6.38.3/fs/namespace.c ---- linux-2.6.38.3/fs/namespace.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/fs/namespace.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/namespace.c linux-2.6.38.4/fs/namespace.c +--- linux-2.6.38.4/fs/namespace.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/fs/namespace.c 2011-04-17 15:57:32.000000000 -0400 @@ -1285,6 +1285,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval =3D do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -33460,9 +32046,9 @@ diff -urNp linux-2.6.38.3/fs/namespace.c linux-2.= 6.38.3/fs/namespace.c get_fs_root(current->fs, &root); down_write(&namespace_sem); mutex_lock(&old.dentry->d_inode->i_mutex); -diff -urNp linux-2.6.38.3/fs/nfs/inode.c linux-2.6.38.3/fs/nfs/inode.c ---- linux-2.6.38.3/fs/nfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/nfs/inode.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/nfs/inode.c linux-2.6.38.4/fs/nfs/inode.c +--- linux-2.6.38.4/fs/nfs/inode.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/nfs/inode.c 2011-04-17 15:57:32.000000000 -0400 @@ -998,16 +998,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -33483,282 +32069,9 @@ diff -urNp linux-2.6.38.3/fs/nfs/inode.c linux-= 2.6.38.3/fs/nfs/inode.c } =20 void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.38.3/fs/nfs/nfs4proc.c linux-2.6.38.3/fs/nfs/nfs4pr= oc.c ---- linux-2.6.38.3/fs/nfs/nfs4proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/nfs/nfs4proc.c 2011-04-17 15:57:32.000000000 -0400 -@@ -1198,7 +1198,7 @@ static int _nfs4_do_open_reclaim(struct=20 - static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nf= s4_state *state) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D _nfs4_do_open_reclaim(ctx, state); -@@ -1240,7 +1240,7 @@ static int _nfs4_open_delegation_recall( -=20 - int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nf= s4_state *state, const nfs4_stateid *stateid) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - struct nfs_server *server =3D NFS_SERVER(state->inode); - int err; - do { -@@ -1615,7 +1615,7 @@ static int _nfs4_open_expired(struct nfs - static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nf= s4_state *state) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -1730,7 +1730,7 @@ out_err: -=20 - static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *= path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cre= d) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - struct nfs4_state *res; - int status; -=20 -@@ -1821,7 +1821,7 @@ static int nfs4_do_setattr(struct inode=20 - struct nfs4_state *state) - { - struct nfs_server *server =3D NFS_SERVER(inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2111,7 +2111,7 @@ static int _nfs4_server_capabilities(str -=20 - int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *= fhandle) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2145,7 +2145,7 @@ static int _nfs4_lookup_root(struct nfs_ - static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *f= handle, - struct nfs_fsinfo *info) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2233,7 +2233,7 @@ static int _nfs4_proc_getattr(struct nfs -=20 - static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *= fhandle, struct nfs_fattr *fattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -2321,7 +2321,7 @@ static int nfs4_proc_lookupfh(struct nfs - struct qstr *name, struct nfs_fh *fhandle, - struct nfs_fattr *fattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); -@@ -2350,7 +2350,7 @@ static int _nfs4_proc_lookup(struct inod -=20 - static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struc= t nfs_fh *fhandle, struct nfs_fattr *fattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dir), -@@ -2417,7 +2417,7 @@ static int _nfs4_proc_access(struct inod -=20 - static int nfs4_proc_access(struct inode *inode, struct nfs_access_entr= y *entry) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(inode), -@@ -2473,7 +2473,7 @@ static int _nfs4_proc_readlink(struct in - static int nfs4_proc_readlink(struct inode *inode, struct page *page, - unsigned int pgbase, unsigned int pglen) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(inode), -@@ -2568,7 +2568,7 @@ out: -=20 - static int nfs4_proc_remove(struct inode *dir, struct qstr *name) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dir), -@@ -2673,7 +2673,7 @@ out: - static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_nam= e, - struct inode *new_dir, struct qstr *new_name) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(old_dir), -@@ -2722,7 +2722,7 @@ out: -=20 - static int nfs4_proc_link(struct inode *inode, struct inode *dir, struc= t qstr *name) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(inode), -@@ -2814,7 +2814,7 @@ out: - static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, - struct page *page, unsigned int len, struct iattr *sattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dir), -@@ -2845,7 +2845,7 @@ out: - static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, - struct iattr *sattr) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - sattr->ia_mode &=3D ~current_umask(); -@@ -2899,7 +2899,7 @@ static int _nfs4_proc_readdir(struct den - static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cr= ed, - u64 cookie, struct page **pages, unsigned int count, int plus) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(dentry->d_inode), -@@ -2947,7 +2947,7 @@ out: - static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, - struct iattr *sattr, dev_t rdev) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - sattr->ia_mode &=3D ~current_umask(); -@@ -2981,7 +2981,7 @@ static int _nfs4_proc_statfs(struct nfs_ -=20 - static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *f= handle, struct nfs_fsstat *fsstat) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(server, -@@ -3012,7 +3012,7 @@ static int _nfs4_do_fsinfo(struct nfs_se -=20 - static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fha= ndle, struct nfs_fsinfo *fsinfo) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -3058,7 +3058,7 @@ static int _nfs4_proc_pathconf(struct nf - static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh = *fhandle, - struct nfs_pathconf *pathconf) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -3404,7 +3404,7 @@ out_free: -=20 - static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, si= ze_t buflen) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - ssize_t ret; - do { - ret =3D __nfs4_get_acl_uncached(inode, buf, buflen); -@@ -3479,7 +3479,7 @@ static int __nfs4_proc_set_acl(struct in -=20 - static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size= _t buflen) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D nfs4_handle_exception(NFS_SERVER(inode), -@@ -3760,7 +3760,7 @@ out: - int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, c= onst nfs4_stateid *stateid, int issync) - { - struct nfs_server *server =3D NFS_SERVER(inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; - do { - err =3D _nfs4_proc_delegreturn(inode, cred, stateid, issync); -@@ -3834,7 +3834,7 @@ out: -=20 - static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct fi= le_lock *request) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -4239,7 +4239,7 @@ static int _nfs4_do_setlk(struct nfs4_st - static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock= *request) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -4257,7 +4257,7 @@ static int nfs4_lock_reclaim(struct nfs4 - static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock= *request) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - err =3D nfs4_set_lock_state(state, request); -@@ -4321,7 +4321,7 @@ out: -=20 - static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct fi= le_lock *request) - { -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - do { -@@ -4381,7 +4381,7 @@ nfs4_proc_lock(struct file *filp, int cm - int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_l= ock *fl) - { - struct nfs_server *server =3D NFS_SERVER(state->inode); -- struct nfs4_exception exception =3D { }; -+ struct nfs4_exception exception =3D {0, 0}; - int err; -=20 - err =3D nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.38.3/fs/nfsd/lockd.c linux-2.6.38.3/fs/nfsd/lockd.c ---- linux-2.6.38.3/fs/nfsd/lockd.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.3/fs/nfsd/lockd.c 2011-04-17 16:53:48.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/nfsd/lockd.c linux-2.6.38.4/fs/nfsd/lockd.c +--- linux-2.6.38.4/fs/nfsd/lockd.c 2011-04-18 17:27:18.000000000 -0400 ++++ linux-2.6.38.4/fs/nfsd/lockd.c 2011-04-17 16:53:48.000000000 -0400 @@ -60,7 +60,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -33768,9 +32081,9 @@ diff -urNp linux-2.6.38.3/fs/nfsd/lockd.c linux-2= .6.38.3/fs/nfsd/lockd.c .fopen =3D nlm_fopen, /* open file for locking */ .fclose =3D nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.38.3/fs/nfsd/nfsctl.c linux-2.6.38.3/fs/nfsd/nfsctl= .c ---- linux-2.6.38.3/fs/nfsd/nfsctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/nfsd/nfsctl.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/nfsd/nfsctl.c linux-2.6.38.4/fs/nfsd/nfsctl= .c +--- linux-2.6.38.4/fs/nfsd/nfsctl.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/nfsd/nfsctl.c 2011-04-17 15:57:32.000000000 -0400 @@ -180,7 +180,7 @@ static int export_features_open(struct i return single_open(file, export_features_show, NULL); } @@ -33780,9 +32093,9 @@ diff -urNp linux-2.6.38.3/fs/nfsd/nfsctl.c linux-= 2.6.38.3/fs/nfsd/nfsctl.c .open =3D export_features_open, .read =3D seq_read, .llseek =3D seq_lseek, -diff -urNp linux-2.6.38.3/fs/nfsd/vfs.c linux-2.6.38.3/fs/nfsd/vfs.c ---- linux-2.6.38.3/fs/nfsd/vfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/nfsd/vfs.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/nfsd/vfs.c linux-2.6.38.4/fs/nfsd/vfs.c +--- linux-2.6.38.4/fs/nfsd/vfs.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/nfsd/vfs.c 2011-04-17 15:57:32.000000000 -0400 @@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs =3D get_fs(); @@ -33810,21 +32123,9 @@ diff -urNp linux-2.6.38.3/fs/nfsd/vfs.c linux-2.= 6.38.3/fs/nfsd/vfs.c set_fs(oldfs); =20 if (host_err < 0) -diff -urNp linux-2.6.38.3/fs/nls/nls_base.c linux-2.6.38.3/fs/nls/nls_ba= se.c ---- linux-2.6.38.3/fs/nls/nls_base.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/nls/nls_base.c 2011-04-17 15:57:32.000000000 -0400 -@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl - {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequen= ce */}, - {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequen= ce */}, - {0xFE, 0xFC, 5*6, 0x7FFFFFFF, 0x4000000, /* 6 byte sequen= ce */}, -- {0, /* end of table */} -+ {0, 0, 0, 0, 0, /* end of table */} - }; -=20 - #define UNICODE_MAX 0x0010ffff -diff -urNp linux-2.6.38.3/fs/notify/dnotify/dnotify.c linux-2.6.38.3/fs/= notify/dnotify/dnotify.c ---- linux-2.6.38.3/fs/notify/dnotify/dnotify.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/fs/notify/dnotify/dnotify.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/fs/notify/dnotify/dnotify.c linux-2.6.38.4/fs/= notify/dnotify/dnotify.c +--- linux-2.6.38.4/fs/notify/dnotify/dnotify.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/fs/notify/dnotify/dnotify.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -151,7 +151,7 @@ static void dnotify_free_mark(struct fsn kmem_cache_free(dnotify_mark_cache, dn_mark); } @@ -33834,9 +32135,9 @@ diff -urNp linux-2.6.38.3/fs/notify/dnotify/dnoti= fy.c linux-2.6.38.3/fs/notify/d .handle_event =3D dnotify_handle_event, .should_send_event =3D dnotify_should_send_event, .free_group_priv =3D NULL, -diff -urNp linux-2.6.38.3/fs/ntfs/dir.c linux-2.6.38.3/fs/ntfs/dir.c ---- linux-2.6.38.3/fs/ntfs/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ntfs/dir.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ntfs/dir.c linux-2.6.38.4/fs/ntfs/dir.c +--- linux-2.6.38.4/fs/ntfs/dir.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ntfs/dir.c 2011-04-17 15:57:32.000000000 -0400 @@ -1329,7 +1329,7 @@ find_next_index_buffer: ia =3D (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & ~(s64)(ndir->itype.index.block_size - 1))); @@ -33846,9 +32147,9 @@ diff -urNp linux-2.6.38.3/fs/ntfs/dir.c linux-2.6= .38.3/fs/ntfs/dir.c ntfs_error(sb, "Out of bounds check failed. Corrupt directory " "inode 0x%lx or driver bug.", vdir->i_ino); goto err_out; -diff -urNp linux-2.6.38.3/fs/ntfs/file.c linux-2.6.38.3/fs/ntfs/file.c ---- linux-2.6.38.3/fs/ntfs/file.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ntfs/file.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ntfs/file.c linux-2.6.38.4/fs/ntfs/file.c +--- linux-2.6.38.4/fs/ntfs/file.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ntfs/file.c 2011-04-17 15:57:32.000000000 -0400 @@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -33858,9 +32159,9 @@ diff -urNp linux-2.6.38.3/fs/ntfs/file.c linux-2.= 6.38.3/fs/ntfs/file.c =20 -const struct inode_operations ntfs_empty_inode_ops =3D {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.38.3/fs/ocfs2/localalloc.c linux-2.6.38.3/fs/ocfs2/= localalloc.c ---- linux-2.6.38.3/fs/ocfs2/localalloc.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/fs/ocfs2/localalloc.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/fs/ocfs2/localalloc.c linux-2.6.38.4/fs/ocfs2/= localalloc.c +--- linux-2.6.38.4/fs/ocfs2/localalloc.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/fs/ocfs2/localalloc.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -33870,9 +32171,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/localalloc.c l= inux-2.6.38.3/fs/ocfs2/localall =20 bail: if (handle) -diff -urNp linux-2.6.38.3/fs/ocfs2/ocfs2.h linux-2.6.38.3/fs/ocfs2/ocfs2= .h ---- linux-2.6.38.3/fs/ocfs2/ocfs2.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ocfs2/ocfs2.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ocfs2/ocfs2.h linux-2.6.38.4/fs/ocfs2/ocfs2= .h +--- linux-2.6.38.4/fs/ocfs2/ocfs2.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ocfs2/ocfs2.h 2011-04-17 15:57:32.000000000 -0400 @@ -230,11 +230,11 @@ enum ocfs2_vol_state =20 struct ocfs2_alloc_stats @@ -33890,9 +32191,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/ocfs2.h linux-= 2.6.38.3/fs/ocfs2/ocfs2.h }; =20 enum ocfs2_local_alloc_state -diff -urNp linux-2.6.38.3/fs/ocfs2/suballoc.c linux-2.6.38.3/fs/ocfs2/su= balloc.c ---- linux-2.6.38.3/fs/ocfs2/suballoc.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/fs/ocfs2/suballoc.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/fs/ocfs2/suballoc.c linux-2.6.38.4/fs/ocfs2/su= balloc.c +--- linux-2.6.38.4/fs/ocfs2/suballoc.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/fs/ocfs2/suballoc.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -33938,9 +32239,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/suballoc.c lin= ux-2.6.38.3/fs/ocfs2/suballoc.c *num_clusters =3D res.sr_bits; } } -diff -urNp linux-2.6.38.3/fs/ocfs2/super.c linux-2.6.38.3/fs/ocfs2/super= .c ---- linux-2.6.38.3/fs/ocfs2/super.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/ocfs2/super.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/ocfs2/super.c linux-2.6.38.4/fs/ocfs2/super= .c +--- linux-2.6.38.4/fs/ocfs2/super.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/ocfs2/super.c 2011-04-17 15:57:32.000000000 -0400 @@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s =3D> GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -33975,9 +32276,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/super.c linux-= 2.6.38.3/fs/ocfs2/super.c =20 /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats =3D *stats; -diff -urNp linux-2.6.38.3/fs/ocfs2/symlink.c linux-2.6.38.3/fs/ocfs2/sym= link.c ---- linux-2.6.38.3/fs/ocfs2/symlink.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/ocfs2/symlink.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/fs/ocfs2/symlink.c linux-2.6.38.4/fs/ocfs2/sym= link.c +--- linux-2.6.38.4/fs/ocfs2/symlink.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/fs/ocfs2/symlink.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -148,7 +148,7 @@ bail: =20 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata= *nd, void *cookie) @@ -33987,9 +32288,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/symlink.c linu= x-2.6.38.3/fs/ocfs2/symlink.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.38.3/fs/open.c linux-2.6.38.3/fs/open.c ---- linux-2.6.38.3/fs/open.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/open.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/open.c linux-2.6.38.4/fs/open.c +--- linux-2.6.38.4/fs/open.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/open.c 2011-04-17 15:57:32.000000000 -0400 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _ error =3D locks_verify_truncate(inode, NULL, length); if (!error) @@ -34127,9 +32428,9 @@ diff -urNp linux-2.6.38.3/fs/open.c linux-2.6.38.= 3/fs/open.c if (IS_ERR(f)) { put_unused_fd(fd); fd =3D PTR_ERR(f); -diff -urNp linux-2.6.38.3/fs/partitions/ldm.c linux-2.6.38.3/fs/partitio= ns/ldm.c ---- linux-2.6.38.3/fs/partitions/ldm.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/fs/partitions/ldm.c 2011-04-18 19:31:25.000000000 -04= 00 +diff -urNp linux-2.6.38.4/fs/partitions/ldm.c linux-2.6.38.4/fs/partitio= ns/ldm.c +--- linux-2.6.38.4/fs/partitions/ldm.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/fs/partitions/ldm.c 2011-04-18 19:31:25.000000000 -04= 00 @@ -1299,6 +1299,11 @@ static bool ldm_frag_add (const u8 *data =20 BUG_ON (!data || !frags); @@ -34176,9 +32477,9 @@ diff -urNp linux-2.6.38.3/fs/partitions/ldm.c lin= ux-2.6.38.3/fs/partitions/ldm.c memcpy (f->data+rec*(size-VBLK_SIZE_HEAD)+VBLK_SIZE_HEAD, data, size); =20 return true; -diff -urNp linux-2.6.38.3/fs/pipe.c linux-2.6.38.3/fs/pipe.c ---- linux-2.6.38.3/fs/pipe.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/pipe.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/pipe.c linux-2.6.38.4/fs/pipe.c +--- linux-2.6.38.4/fs/pipe.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/pipe.c 2011-04-17 15:57:32.000000000 -0400 @@ -420,9 +420,9 @@ redo: } if (bufs) /* More to do? */ @@ -34302,9 +32603,9 @@ diff -urNp linux-2.6.38.3/fs/pipe.c linux-2.6.38.= 3/fs/pipe.c inode->i_fop =3D &rdwr_pipefifo_fops; =20 /* -diff -urNp linux-2.6.38.3/fs/proc/array.c linux-2.6.38.3/fs/proc/array.c ---- linux-2.6.38.3/fs/proc/array.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/array.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/array.c linux-2.6.38.4/fs/proc/array.c +--- linux-2.6.38.4/fs/proc/array.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/array.c 2011-04-20 18:14:54.000000000 -0400 @@ -60,6 +60,7 @@ #include #include @@ -34396,7 +32697,7 @@ diff -urNp linux-2.6.38.3/fs/proc/array.c linux-2= .6.38.3/fs/proc/array.c esp, eip, /* The signal information here is obsolete. -@@ -544,3 +594,10 @@ int proc_pid_statm(struct seq_file *m, s +@@ -544,3 +594,18 @@ int proc_pid_statm(struct seq_file *m, s =20 return 0; } @@ -34404,12 +32705,20 @@ diff -urNp linux-2.6.38.3/fs/proc/array.c linux= -2.6.38.3/fs/proc/array.c +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR +int proc_pid_ipaddr(struct task_struct *task, char *buffer) +{ -+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); ++ u32 curr_ip =3D 0; ++ unsigned long flags; ++ ++ if (lock_task_sighand(task, &flags)) { ++ curr_ip =3D task->signal->curr_ip; ++ unlock_task_sighand(task, &flags); ++ } ++ ++ return sprintf(buffer, "%pI4\n", &curr_ip); +} +#endif -diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3/fs/proc/base.c ---- linux-2.6.38.3/fs/proc/base.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/base.c 2011-04-18 19:26:45.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/base.c linux-2.6.38.4/fs/proc/base.c +--- linux-2.6.38.4/fs/proc/base.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/base.c 2011-04-22 19:21:23.000000000 -0400 @@ -104,6 +104,22 @@ struct pid_entry { union proc_op op; }; @@ -34775,14 +33084,10 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-= 2.6.38.3/fs/proc/base.c put_task_struct(task); out: return result; -@@ -3066,11 +3189,21 @@ static int proc_pid_fill_cache(struct fi - /* for the /proc/ directory itself, after non-process stuff has been do= ne */ - int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filld= ir) - { -- unsigned int nr =3D filp->f_pos - FIRST_PROCESS_ENTRY; -- struct task_struct *reaper =3D get_proc_task(filp->f_path.dentry->d_in= ode); -+ unsigned int nr; -+ struct task_struct *reaper; +@@ -3068,6 +3191,11 @@ int proc_pid_readdir(struct file * filp, + { + unsigned int nr; + struct task_struct *reaper; +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PRO= C_USERGROUP) + const struct cred *tmpcred =3D current_cred(); + const struct cred *itercred; @@ -34791,15 +33096,7 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2= .6.38.3/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; =20 -+ if (filp->f_pos >=3D PID_MAX_LIMIT + TGID_OFFSET) -+ goto out_no_task; -+ nr =3D filp->f_pos - FIRST_PROCESS_ENTRY; -+ -+ reaper =3D get_proc_task(filp->f_path.dentry->d_inode); - if (!reaper) - goto out_no_task; -=20 -@@ -3086,8 +3219,27 @@ int proc_pid_readdir(struct file * filp, +@@ -3091,8 +3219,27 @@ int proc_pid_readdir(struct file * filp, for (iter =3D next_tgid(ns, iter); iter.task; iter.tgid +=3D 1, iter =3D next_tgid(ns, iter)) { @@ -34828,7 +33125,7 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.= 6.38.3/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -3114,7 +3266,7 @@ static const struct pid_entry tid_base_s +@@ -3119,7 +3266,7 @@ static const struct pid_entry tid_base_s REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations), @@ -34837,7 +33134,7 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.= 6.38.3/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -3138,10 +3290,10 @@ static const struct pid_entry tid_base_s +@@ -3143,10 +3290,10 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc= _attr_dir_operations), #endif @@ -34850,9 +33147,9 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.= 6.38.3/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.38.3/fs/proc/cmdline.c linux-2.6.38.3/fs/proc/cmdli= ne.c ---- linux-2.6.38.3/fs/proc/cmdline.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/cmdline.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/cmdline.c linux-2.6.38.4/fs/proc/cmdli= ne.c +--- linux-2.6.38.4/fs/proc/cmdline.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/cmdline.c 2011-04-17 15:57:32.000000000 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl =20 static int __init proc_cmdline_init(void) @@ -34865,9 +33162,9 @@ diff -urNp linux-2.6.38.3/fs/proc/cmdline.c linux= -2.6.38.3/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.38.3/fs/proc/devices.c linux-2.6.38.3/fs/proc/devic= es.c ---- linux-2.6.38.3/fs/proc/devices.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/devices.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/devices.c linux-2.6.38.4/fs/proc/devic= es.c +--- linux-2.6.38.4/fs/proc/devices.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/devices.c 2011-04-17 15:57:32.000000000 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc =20 static int __init proc_devices_init(void) @@ -34880,9 +33177,9 @@ diff -urNp linux-2.6.38.3/fs/proc/devices.c linux= -2.6.38.3/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.38.3/fs/proc/inode.c linux-2.6.38.3/fs/proc/inode.c ---- linux-2.6.38.3/fs/proc/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/inode.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/inode.c linux-2.6.38.4/fs/proc/inode.c +--- linux-2.6.38.4/fs/proc/inode.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/inode.c 2011-04-17 15:57:32.000000000 -0400 @@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode =3D de->mode; @@ -34895,9 +33192,9 @@ diff -urNp linux-2.6.38.3/fs/proc/inode.c linux-2= .6.38.3/fs/proc/inode.c } if (de->size) inode->i_size =3D de->size; -diff -urNp linux-2.6.38.3/fs/proc/internal.h linux-2.6.38.3/fs/proc/inte= rnal.h ---- linux-2.6.38.3/fs/proc/internal.h 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/proc/internal.h 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/fs/proc/internal.h linux-2.6.38.4/fs/proc/inte= rnal.h +--- linux-2.6.38.4/fs/proc/internal.h 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/fs/proc/internal.h 2011-04-17 15:57:32.000000000 -040= 0 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task); extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, @@ -34908,9 +33205,9 @@ diff -urNp linux-2.6.38.3/fs/proc/internal.h linu= x-2.6.38.3/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); =20 extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.38.3/fs/proc/Kconfig linux-2.6.38.3/fs/proc/Kconfig ---- linux-2.6.38.3/fs/proc/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/Kconfig 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/Kconfig linux-2.6.38.4/fs/proc/Kconfig +--- linux-2.6.38.4/fs/proc/Kconfig 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/Kconfig 2011-04-17 15:57:32.000000000 -0400 @@ -30,12 +30,12 @@ config PROC_FS =20 config PROC_KCORE @@ -34938,9 +33235,9 @@ diff -urNp linux-2.6.38.3/fs/proc/Kconfig linux-2= .6.38.3/fs/proc/Kconfig bool "Enable /proc page monitoring" if EXPERT help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.38.3/fs/proc/kcore.c linux-2.6.38.3/fs/proc/kcore.c ---- linux-2.6.38.3/fs/proc/kcore.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/kcore.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/kcore.c linux-2.6.38.4/fs/proc/kcore.c +--- linux-2.6.38.4/fs/proc/kcore.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/kcore.c 2011-04-17 15:57:32.000000000 -0400 @@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use * the addresses in the elf_phdr on our list. */ @@ -34999,9 +33296,9 @@ diff -urNp linux-2.6.38.3/fs/proc/kcore.c linux-2= .6.38.3/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.38.3/fs/proc/meminfo.c linux-2.6.38.3/fs/proc/memin= fo.c ---- linux-2.6.38.3/fs/proc/meminfo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/meminfo.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/meminfo.c linux-2.6.38.4/fs/proc/memin= fo.c +--- linux-2.6.38.4/fs/proc/meminfo.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/meminfo.c 2011-04-17 15:57:32.000000000 -0400 @@ -157,7 +157,7 @@ static int meminfo_proc_show(struct seq_ vmi.used >> 10, vmi.largest_chunk >> 10 @@ -35011,9 +33308,9 @@ diff -urNp linux-2.6.38.3/fs/proc/meminfo.c linux= -2.6.38.3/fs/proc/meminfo.c #endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * -diff -urNp linux-2.6.38.3/fs/proc/nommu.c linux-2.6.38.3/fs/proc/nommu.c ---- linux-2.6.38.3/fs/proc/nommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/nommu.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/nommu.c linux-2.6.38.4/fs/proc/nommu.c +--- linux-2.6.38.4/fs/proc/nommu.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/nommu.c 2011-04-17 15:57:32.000000000 -0400 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len =3D 1; @@ -35023,9 +33320,9 @@ diff -urNp linux-2.6.38.3/fs/proc/nommu.c linux-2= .6.38.3/fs/proc/nommu.c } =20 seq_putc(m, '\n'); -diff -urNp linux-2.6.38.3/fs/proc/proc_net.c linux-2.6.38.3/fs/proc/proc= _net.c ---- linux-2.6.38.3/fs/proc/proc_net.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/proc/proc_net.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/fs/proc/proc_net.c linux-2.6.38.4/fs/proc/proc= _net.c +--- linux-2.6.38.4/fs/proc/proc_net.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/fs/proc/proc_net.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -35044,9 +33341,9 @@ diff -urNp linux-2.6.38.3/fs/proc/proc_net.c linu= x-2.6.38.3/fs/proc/proc_net.c =20 rcu_read_lock(); task =3D pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.38.3/fs/proc/proc_sysctl.c linux-2.6.38.3/fs/proc/p= roc_sysctl.c ---- linux-2.6.38.3/fs/proc/proc_sysctl.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/fs/proc/proc_sysctl.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/fs/proc/proc_sysctl.c linux-2.6.38.4/fs/proc/p= roc_sysctl.c +--- linux-2.6.38.4/fs/proc/proc_sysctl.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/fs/proc/proc_sysctl.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -8,6 +8,8 @@ #include #include "internal.h" @@ -35086,9 +33383,9 @@ diff -urNp linux-2.6.38.3/fs/proc/proc_sysctl.c l= inux-2.6.38.3/fs/proc/proc_sysc generic_fillattr(inode, stat); if (table) stat->mode =3D (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.38.3/fs/proc/root.c linux-2.6.38.3/fs/proc/root.c ---- linux-2.6.38.3/fs/proc/root.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/proc/root.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/proc/root.c linux-2.6.38.4/fs/proc/root.c +--- linux-2.6.38.4/fs/proc/root.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/proc/root.c 2011-04-17 15:57:32.000000000 -0400 @@ -132,7 +132,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -35105,9 +33402,9 @@ diff -urNp linux-2.6.38.3/fs/proc/root.c linux-2.= 6.38.3/fs/proc/root.c proc_sys_init(); } =20 -diff -urNp linux-2.6.38.3/fs/proc/task_mmu.c linux-2.6.38.3/fs/proc/task= _mmu.c ---- linux-2.6.38.3/fs/proc/task_mmu.c 2011-04-18 17:27:16.000000000 -040= 0 -+++ linux-2.6.38.3/fs/proc/task_mmu.c 2011-04-18 19:35:47.000000000 -040= 0 +diff -urNp linux-2.6.38.4/fs/proc/task_mmu.c linux-2.6.38.4/fs/proc/task= _mmu.c +--- linux-2.6.38.4/fs/proc/task_mmu.c 2011-04-18 17:27:16.000000000 -040= 0 ++++ linux-2.6.38.4/fs/proc/task_mmu.c 2011-04-18 19:35:47.000000000 -040= 0 @@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" @@ -35257,9 +33554,9 @@ diff -urNp linux-2.6.38.3/fs/proc/task_mmu.c linu= x-2.6.38.3/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.38.3/fs/proc/task_nommu.c linux-2.6.38.3/fs/proc/ta= sk_nommu.c ---- linux-2.6.38.3/fs/proc/task_nommu.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/fs/proc/task_nommu.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/fs/proc/task_nommu.c linux-2.6.38.4/fs/proc/ta= sk_nommu.c +--- linux-2.6.38.4/fs/proc/task_nommu.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/fs/proc/task_nommu.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct else bytes +=3D kobjsize(mm); @@ -35278,9 +33575,9 @@ diff -urNp linux-2.6.38.3/fs/proc/task_nommu.c li= nux-2.6.38.3/fs/proc/task_nommu } else if (mm) { if (vma->vm_start <=3D mm->start_stack && vma->vm_end >=3D mm->start_stack) { -diff -urNp linux-2.6.38.3/fs/readdir.c linux-2.6.38.3/fs/readdir.c ---- linux-2.6.38.3/fs/readdir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/readdir.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/readdir.c linux-2.6.38.4/fs/readdir.c +--- linux-2.6.38.4/fs/readdir.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/readdir.c 2011-04-17 15:57:32.000000000 -0400 @@ -17,6 +17,7 @@ #include #include @@ -35370,9 +33667,9 @@ diff -urNp linux-2.6.38.3/fs/readdir.c linux-2.6.= 38.3/fs/readdir.c buf.count =3D count; buf.error =3D 0; =20 -diff -urNp linux-2.6.38.3/fs/reiserfs/do_balan.c linux-2.6.38.3/fs/reise= rfs/do_balan.c ---- linux-2.6.38.3/fs/reiserfs/do_balan.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/fs/reiserfs/do_balan.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/fs/reiserfs/do_balan.c linux-2.6.38.4/fs/reise= rfs/do_balan.c +--- linux-2.6.38.4/fs/reiserfs/do_balan.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/fs/reiserfs/do_balan.c 2011-04-17 15:57:32.000000000 = -0400 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -35382,9 +33679,9 @@ diff -urNp linux-2.6.38.3/fs/reiserfs/do_balan.c = linux-2.6.38.3/fs/reiserfs/do_b do_balance_starts(tb); =20 /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.38.3/fs/reiserfs/item_ops.c linux-2.6.38.3/fs/reise= rfs/item_ops.c ---- linux-2.6.38.3/fs/reiserfs/item_ops.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/fs/reiserfs/item_ops.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/fs/reiserfs/item_ops.c linux-2.6.38.4/fs/reise= rfs/item_ops.c +--- linux-2.6.38.4/fs/reiserfs/item_ops.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/fs/reiserfs/item_ops.c 2011-04-17 15:57:32.000000000 = -0400 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -35439,9 +33736,9 @@ diff -urNp linux-2.6.38.3/fs/reiserfs/item_ops.c = linux-2.6.38.3/fs/reiserfs/item &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.38.3/fs/reiserfs/procfs.c linux-2.6.38.3/fs/reiserf= s/procfs.c ---- linux-2.6.38.3/fs/reiserfs/procfs.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/fs/reiserfs/procfs.c 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/fs/reiserfs/procfs.c linux-2.6.38.4/fs/reiserf= s/procfs.c +--- linux-2.6.38.4/fs/reiserfs/procfs.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/fs/reiserfs/procfs.c 2011-04-17 15:57:32.000000000 -0= 400 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -35451,9 +33748,9 @@ diff -urNp linux-2.6.38.3/fs/reiserfs/procfs.c li= nux-2.6.38.3/fs/reiserfs/procfs SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), -diff -urNp linux-2.6.38.3/fs/select.c linux-2.6.38.3/fs/select.c ---- linux-2.6.38.3/fs/select.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/select.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/select.c linux-2.6.38.4/fs/select.c +--- linux-2.6.38.4/fs/select.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/select.c 2011-04-17 15:57:32.000000000 -0400 @@ -20,6 +20,7 @@ #include #include @@ -35470,9 +33767,9 @@ diff -urNp linux-2.6.38.3/fs/select.c linux-2.6.3= 8.3/fs/select.c if (nfds > rlimit(RLIMIT_NOFILE)) return -EINVAL; =20 -diff -urNp linux-2.6.38.3/fs/seq_file.c linux-2.6.38.3/fs/seq_file.c ---- linux-2.6.38.3/fs/seq_file.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/seq_file.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/seq_file.c linux-2.6.38.4/fs/seq_file.c +--- linux-2.6.38.4/fs/seq_file.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/seq_file.c 2011-04-17 15:57:32.000000000 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,=20 return 0; } @@ -35513,9 +33810,9 @@ diff -urNp linux-2.6.38.3/fs/seq_file.c linux-2.6= .38.3/fs/seq_file.c if (!m->buf) goto Enomem; m->count =3D 0; -diff -urNp linux-2.6.38.3/fs/splice.c linux-2.6.38.3/fs/splice.c ---- linux-2.6.38.3/fs/splice.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/splice.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c +--- linux-2.6.38.4/fs/splice.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/splice.c 2011-04-17 15:57:32.000000000 -0400 @@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); =20 @@ -35654,9 +33951,9 @@ diff -urNp linux-2.6.38.3/fs/splice.c linux-2.6.3= 8.3/fs/splice.c ret =3D -EAGAIN; =20 pipe_unlock(ipipe); -diff -urNp linux-2.6.38.3/fs/sysfs/mount.c linux-2.6.38.3/fs/sysfs/mount= .c ---- linux-2.6.38.3/fs/sysfs/mount.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/sysfs/mount.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/sysfs/mount.c linux-2.6.38.4/fs/sysfs/mount= .c +--- linux-2.6.38.4/fs/sysfs/mount.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/sysfs/mount.c 2011-04-17 15:57:32.000000000 -0400 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root =3D { .s_name =3D "", .s_count =3D ATOMIC_INIT(1), @@ -35669,9 +33966,9 @@ diff -urNp linux-2.6.38.3/fs/sysfs/mount.c linux-= 2.6.38.3/fs/sysfs/mount.c .s_ino =3D 1, }; =20 -diff -urNp linux-2.6.38.3/fs/sysfs/symlink.c linux-2.6.38.3/fs/sysfs/sym= link.c ---- linux-2.6.38.3/fs/sysfs/symlink.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/fs/sysfs/symlink.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/fs/sysfs/symlink.c linux-2.6.38.4/fs/sysfs/sym= link.c +--- linux-2.6.38.4/fs/sysfs/symlink.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/fs/sysfs/symlink.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de =20 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd,= void *cookie) @@ -35681,46 +33978,9 @@ diff -urNp linux-2.6.38.3/fs/sysfs/symlink.c lin= ux-2.6.38.3/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.38.3/fs/ubifs/debug.c linux-2.6.38.3/fs/ubifs/debug= .c ---- linux-2.6.38.3/fs/ubifs/debug.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.3/fs/ubifs/debug.c 2011-04-17 16:53:48.000000000 -0400 -@@ -2844,19 +2844,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf - } -=20 - fname =3D "dump_lprops"; -- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; -+ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; - if (IS_ERR(dent)) - goto out_remove; - d->dfs_dump_lprops =3D dent; -=20 - fname =3D "dump_budg"; -- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; -+ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; - if (IS_ERR(dent)) - goto out_remove; - d->dfs_dump_budg =3D dent; -=20 - fname =3D "dump_tnc"; -- dent =3D debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops)= ; -+ dent =3D debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops)= ; - if (IS_ERR(dent)) - goto out_remove; - d->dfs_dump_tnc =3D dent; -diff -urNp linux-2.6.38.3/fs/udf/misc.c linux-2.6.38.3/fs/udf/misc.c ---- linux-2.6.38.3/fs/udf/misc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/udf/misc.c 2011-04-17 15:57:32.000000000 -0400 -@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat - iinfo->i_lenEAttr +=3D size; - return (struct genericFormat *)&ea[offset]; - } -- if (loc & 0x02) -- ; -+ if (loc & 0x02) { -+ } -=20 - return NULL; - } +diff -urNp linux-2.6.38.4/fs/udf/misc.c linux-2.6.38.4/fs/udf/misc.c +--- linux-2.6.38.4/fs/udf/misc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/udf/misc.c 2011-04-23 12:47:28.000000000 -0400 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id =20 u8 udf_tag_checksum(const struct tag *t) @@ -35730,21 +33990,9 @@ diff -urNp linux-2.6.38.3/fs/udf/misc.c linux-2.= 6.38.3/fs/udf/misc.c u8 checksum =3D 0; int i; for (i =3D 0; i < sizeof(struct tag); ++i) -diff -urNp linux-2.6.38.3/fs/udf/udfdecl.h linux-2.6.38.3/fs/udf/udfdecl= .h ---- linux-2.6.38.3/fs/udf/udfdecl.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/udf/udfdecl.h 2011-04-17 15:57:32.000000000 -0400 -@@ -26,7 +26,7 @@ do { \ - printk(f, ##a); \ - } while (0) - #else --#define udf_debug(f, a...) /**/ -+#define udf_debug(f, a...) do {} while (0) - #endif -=20 - #define udf_info(f, a...) \ -diff -urNp linux-2.6.38.3/fs/utimes.c linux-2.6.38.3/fs/utimes.c ---- linux-2.6.38.3/fs/utimes.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/utimes.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/utimes.c linux-2.6.38.4/fs/utimes.c +--- linux-2.6.38.4/fs/utimes.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/utimes.c 2011-04-17 15:57:32.000000000 -0400 @@ -1,6 +1,7 @@ #include #include @@ -35766,9 +34014,9 @@ diff -urNp linux-2.6.38.3/fs/utimes.c linux-2.6.3= 8.3/fs/utimes.c mutex_lock(&inode->i_mutex); error =3D notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.38.3/fs/xattr_acl.c linux-2.6.38.3/fs/xattr_acl.c ---- linux-2.6.38.3/fs/xattr_acl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/xattr_acl.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/xattr_acl.c linux-2.6.38.4/fs/xattr_acl.c +--- linux-2.6.38.4/fs/xattr_acl.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/xattr_acl.c 2011-04-17 15:57:32.000000000 -0400 @@ -17,8 +17,8 @@ struct posix_acl * posix_acl_from_xattr(const void *value, size_t size) @@ -35780,9 +34028,9 @@ diff -urNp linux-2.6.38.3/fs/xattr_acl.c linux-2.= 6.38.3/fs/xattr_acl.c int count; struct posix_acl *acl; struct posix_acl_entry *acl_e; -diff -urNp linux-2.6.38.3/fs/xattr.c linux-2.6.38.3/fs/xattr.c ---- linux-2.6.38.3/fs/xattr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/xattr.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/xattr.c linux-2.6.38.4/fs/xattr.c +--- linux-2.6.38.4/fs/xattr.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/xattr.c 2011-04-17 15:57:32.000000000 -0400 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); * Extended attribute SET operations */ @@ -35845,9 +34093,9 @@ diff -urNp linux-2.6.38.3/fs/xattr.c linux-2.6.38= .3/fs/xattr.c mnt_drop_write(f->f_path.mnt); } fput(f); -diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.3/= fs/xfs/linux-2.6/xfs_ioctl32.c ---- linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.4/= fs/xfs/linux-2.6/xfs_ioctl32.c +--- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:57:32.00= 0000000 -0400 @@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1( xfs_fsop_geom_t fsgeo; int error; @@ -35856,9 +34104,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_io= ctl32.c linux-2.6.38.3/fs/xfs/l error =3D xfs_fs_geometry(mp, &fsgeo, 3); if (error) return -error; -diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.3/fs= /xfs/linux-2.6/xfs_ioctl.c ---- linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:08:09.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.4/fs= /xfs/linux-2.6/xfs_ioctl.c +--- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:08:09.0000= 00000 -0400 @@ -128,7 +128,7 @@ xfs_find_handle( } =20 @@ -35868,9 +34116,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_io= ctl.c linux-2.6.38.3/fs/xfs/lin copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; =20 -diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.3/fs/= xfs/linux-2.6/xfs_iops.c ---- linux-2.6.38.3/fs/xfs/linux-2.6/xfs_iops.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.4/fs/= xfs/linux-2.6/xfs_iops.c +--- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -436,7 +436,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -35880,9 +34128,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_io= ps.c linux-2.6.38.3/fs/xfs/linu =20 if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.38.3/fs/xfs/xfs_bmap.c linux-2.6.38.3/fs/xfs/xfs_bm= ap.c ---- linux-2.6.38.3/fs/xfs/xfs_bmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/fs/xfs/xfs_bmap.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/fs/xfs/xfs_bmap.c linux-2.6.38.4/fs/xfs/xfs_bm= ap.c +--- linux-2.6.38.4/fs/xfs/xfs_bmap.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/fs/xfs/xfs_bmap.c 2011-04-17 15:57:32.000000000 -0400 @@ -287,7 +287,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -35892,9 +34140,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/xfs_bmap.c linux= -2.6.38.3/fs/xfs/xfs_bmap.c #endif /* DEBUG */ =20 STATIC int -diff -urNp linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c linux-2.6.38.3/fs/xfs/xfs= _dir2_sf.c ---- linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:03:12.000000000 -0= 400 +diff -urNp linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c linux-2.6.38.4/fs/xfs/xfs= _dir2_sf.c +--- linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:03:12.000000000 -0= 400 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents( } =20 @@ -35912,9 +34160,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c li= nux-2.6.38.3/fs/xfs/xfs_dir2_sf off & 0x7fffffff, ino, DT_UNKNOWN)) { *offset =3D off & 0x7fffffff; return 0; -diff -urNp linux-2.6.38.3/grsecurity/gracl_alloc.c linux-2.6.38.3/grsecu= rity/gracl_alloc.c ---- linux-2.6.38.3/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.38.3/grsecurity/gracl_alloc.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/grsecurity/gracl_alloc.c linux-2.6.38.4/grsecu= rity/gracl_alloc.c +--- linux-2.6.38.4/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.38.4/grsecurity/gracl_alloc.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -0,0 +1,105 @@ +#include +#include @@ -36021,9 +34269,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_alloc.= c linux-2.6.38.3/grsecurity/gra + else + return 1; +} -diff -urNp linux-2.6.38.3/grsecurity/gracl.c linux-2.6.38.3/grsecurity/g= racl.c ---- linux-2.6.38.3/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -050= 0 -+++ linux-2.6.38.3/grsecurity/gracl.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/grsecurity/gracl.c linux-2.6.38.4/grsecurity/g= racl.c +--- linux-2.6.38.4/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.38.4/grsecurity/gracl.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -0,0 +1,4074 @@ +#include +#include @@ -40099,9 +38347,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl.c linu= x-2.6.38.3/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.38.3/grsecurity/gracl_cap.c linux-2.6.38.3/grsecuri= ty/gracl_cap.c ---- linux-2.6.38.3/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/grsecurity/gracl_cap.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/grsecurity/gracl_cap.c linux-2.6.38.4/grsecuri= ty/gracl_cap.c +--- linux-2.6.38.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/grsecurity/gracl_cap.c 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,139 @@ +#include +#include @@ -40242,9 +38490,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_cap.c = linux-2.6.38.3/grsecurity/gracl + return 0; +} + -diff -urNp linux-2.6.38.3/grsecurity/gracl_fs.c linux-2.6.38.3/grsecurit= y/gracl_fs.c ---- linux-2.6.38.3/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.38.3/grsecurity/gracl_fs.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/grsecurity/gracl_fs.c linux-2.6.38.4/grsecurit= y/gracl_fs.c +--- linux-2.6.38.4/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -= 0500 ++++ linux-2.6.38.4/grsecurity/gracl_fs.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -0,0 +1,431 @@ +#include +#include @@ -40677,9 +38925,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_fs.c l= inux-2.6.38.3/grsecurity/gracl_ + + return 0; +} -diff -urNp linux-2.6.38.3/grsecurity/gracl_ip.c linux-2.6.38.3/grsecurit= y/gracl_ip.c ---- linux-2.6.38.3/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.38.3/grsecurity/gracl_ip.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/grsecurity/gracl_ip.c linux-2.6.38.4/grsecurit= y/gracl_ip.c +--- linux-2.6.38.4/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -= 0500 ++++ linux-2.6.38.4/grsecurity/gracl_ip.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -0,0 +1,382 @@ +#include +#include @@ -41063,9 +39311,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_ip.c l= inux-2.6.38.3/grsecurity/gracl_ + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin= , SOCK_DGRAM); +} -diff -urNp linux-2.6.38.3/grsecurity/gracl_learn.c linux-2.6.38.3/grsecu= rity/gracl_learn.c ---- linux-2.6.38.3/grsecurity/gracl_learn.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.38.3/grsecurity/gracl_learn.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/grsecurity/gracl_learn.c linux-2.6.38.4/grsecu= rity/gracl_learn.c +--- linux-2.6.38.4/grsecurity/gracl_learn.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.38.4/grsecurity/gracl_learn.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -0,0 +1,211 @@ +#include +#include @@ -41278,9 +39526,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_learn.= c linux-2.6.38.3/grsecurity/gra + .release =3D close_learn, + .poll =3D poll_learn, +}; -diff -urNp linux-2.6.38.3/grsecurity/gracl_res.c linux-2.6.38.3/grsecuri= ty/gracl_res.c ---- linux-2.6.38.3/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/grsecurity/gracl_res.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/grsecurity/gracl_res.c linux-2.6.38.4/grsecuri= ty/gracl_res.c +--- linux-2.6.38.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/grsecurity/gracl_res.c 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,68 @@ +#include +#include @@ -41350,9 +39598,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_res.c = linux-2.6.38.3/grsecurity/gracl + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.38.3/grsecurity/gracl_segv.c linux-2.6.38.3/grsecur= ity/gracl_segv.c ---- linux-2.6.38.3/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/grsecurity/gracl_segv.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/grsecurity/gracl_segv.c linux-2.6.38.4/grsecur= ity/gracl_segv.c +--- linux-2.6.38.4/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/grsecurity/gracl_segv.c 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,300 @@ +#include +#include @@ -41654,9 +39902,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_segv.c= linux-2.6.38.3/grsecurity/grac + + return; +} -diff -urNp linux-2.6.38.3/grsecurity/gracl_shm.c linux-2.6.38.3/grsecuri= ty/gracl_shm.c ---- linux-2.6.38.3/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/grsecurity/gracl_shm.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/grsecurity/gracl_shm.c linux-2.6.38.4/grsecuri= ty/gracl_shm.c +--- linux-2.6.38.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/grsecurity/gracl_shm.c 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,40 @@ +#include +#include @@ -41698,9 +39946,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_shm.c = linux-2.6.38.3/grsecurity/gracl + + return 1; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_chdir.c linux-2.6.38.3/grsecu= rity/grsec_chdir.c ---- linux-2.6.38.3/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.38.3/grsecurity/grsec_chdir.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_chdir.c linux-2.6.38.4/grsecu= rity/grsec_chdir.c +--- linux-2.6.38.4/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.38.4/grsecurity/grsec_chdir.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -0,0 +1,19 @@ +#include +#include @@ -41721,9 +39969,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_chdir.= c linux-2.6.38.3/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_chroot.c linux-2.6.38.3/grsec= urity/grsec_chroot.c ---- linux-2.6.38.3/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.38.3/grsecurity/grsec_chroot.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_chroot.c linux-2.6.38.4/grsec= urity/grsec_chroot.c +--- linux-2.6.38.4/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.38.4/grsecurity/grsec_chroot.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -0,0 +1,355 @@ +#include +#include @@ -42080,9 +40328,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_chroot= .c linux-2.6.38.3/grsecurity/gr +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.38.3/grsecurity/grsec_disabled.c linux-2.6.38.3/grs= ecurity/grsec_disabled.c ---- linux-2.6.38.3/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.00000= 0000 -0500 -+++ linux-2.6.38.3/grsecurity/grsec_disabled.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_disabled.c linux-2.6.38.4/grs= ecurity/grsec_disabled.c +--- linux-2.6.38.4/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.00000= 0000 -0500 ++++ linux-2.6.38.4/grsecurity/grsec_disabled.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -0,0 +1,447 @@ +#include +#include @@ -42531,9 +40779,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_disabl= ed.c linux-2.6.38.3/grsecurity/ +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.38.3/grsecurity/grsec_exec.c linux-2.6.38.3/grsecur= ity/grsec_exec.c ---- linux-2.6.38.3/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/grsecurity/grsec_exec.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_exec.c linux-2.6.38.4/grsecur= ity/grsec_exec.c +--- linux-2.6.38.4/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/grsecurity/grsec_exec.c 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,147 @@ +#include +#include @@ -42682,9 +40930,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_exec.c= linux-2.6.38.3/grsecurity/grse + return; +} +#endif -diff -urNp linux-2.6.38.3/grsecurity/grsec_fifo.c linux-2.6.38.3/grsecur= ity/grsec_fifo.c ---- linux-2.6.38.3/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/grsecurity/grsec_fifo.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_fifo.c linux-2.6.38.4/grsecur= ity/grsec_fifo.c +--- linux-2.6.38.4/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/grsecurity/grsec_fifo.c 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,24 @@ +#include +#include @@ -42710,9 +40958,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_fifo.c= linux-2.6.38.3/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_fork.c linux-2.6.38.3/grsecur= ity/grsec_fork.c ---- linux-2.6.38.3/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/grsecurity/grsec_fork.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_fork.c linux-2.6.38.4/grsecur= ity/grsec_fork.c +--- linux-2.6.38.4/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/grsecurity/grsec_fork.c 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,23 @@ +#include +#include @@ -42737,9 +40985,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_fork.c= linux-2.6.38.3/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_init.c linux-2.6.38.3/grsecur= ity/grsec_init.c ---- linux-2.6.38.3/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/grsecurity/grsec_init.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_init.c linux-2.6.38.4/grsecur= ity/grsec_init.c +--- linux-2.6.38.4/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/grsecurity/grsec_init.c 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,270 @@ +#include +#include @@ -43011,9 +41259,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_init.c= linux-2.6.38.3/grsecurity/grse + + return; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_link.c linux-2.6.38.3/grsecur= ity/grsec_link.c ---- linux-2.6.38.3/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/grsecurity/grsec_link.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_link.c linux-2.6.38.4/grsecur= ity/grsec_link.c +--- linux-2.6.38.4/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/grsecurity/grsec_link.c 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,43 @@ +#include +#include @@ -43058,9 +41306,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_link.c= linux-2.6.38.3/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_log.c linux-2.6.38.3/grsecuri= ty/grsec_log.c ---- linux-2.6.38.3/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/grsecurity/grsec_log.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_log.c linux-2.6.38.4/grsecuri= ty/grsec_log.c +--- linux-2.6.38.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/grsecurity/grsec_log.c 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,310 @@ +#include +#include @@ -43372,9 +41620,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_log.c = linux-2.6.38.3/grsecurity/grsec + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_mem.c linux-2.6.38.3/grsecuri= ty/grsec_mem.c ---- linux-2.6.38.3/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/grsecurity/grsec_mem.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_mem.c linux-2.6.38.4/grsecuri= ty/grsec_mem.c +--- linux-2.6.38.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/grsecurity/grsec_mem.c 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,33 @@ +#include +#include @@ -43409,9 +41657,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_mem.c = linux-2.6.38.3/grsecurity/grsec + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_mount.c linux-2.6.38.3/grsecu= rity/grsec_mount.c ---- linux-2.6.38.3/grsecurity/grsec_mount.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.38.3/grsecurity/grsec_mount.c 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_mount.c linux-2.6.38.4/grsecu= rity/grsec_mount.c +--- linux-2.6.38.4/grsecurity/grsec_mount.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.38.4/grsecurity/grsec_mount.c 2011-04-17 15:57:32.00000000= 0 -0400 @@ -0,0 +1,62 @@ +#include +#include @@ -43475,9 +41723,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_mount.= c linux-2.6.38.3/grsecurity/grs +#endif + return 0; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_pax.c linux-2.6.38.3/grsecuri= ty/grsec_pax.c ---- linux-2.6.38.3/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/grsecurity/grsec_pax.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_pax.c linux-2.6.38.4/grsecuri= ty/grsec_pax.c +--- linux-2.6.38.4/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/grsecurity/grsec_pax.c 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,36 @@ +#include +#include @@ -43515,9 +41763,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_pax.c = linux-2.6.38.3/grsecurity/grsec +#endif + return; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_ptrace.c linux-2.6.38.3/grsec= urity/grsec_ptrace.c ---- linux-2.6.38.3/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.38.3/grsecurity/grsec_ptrace.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_ptrace.c linux-2.6.38.4/grsec= urity/grsec_ptrace.c +--- linux-2.6.38.4/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.38.4/grsecurity/grsec_ptrace.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -0,0 +1,14 @@ +#include +#include @@ -43533,9 +41781,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_ptrace= .c linux-2.6.38.3/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_sig.c linux-2.6.38.3/grsecuri= ty/grsec_sig.c ---- linux-2.6.38.3/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/grsecurity/grsec_sig.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_sig.c linux-2.6.38.4/grsecuri= ty/grsec_sig.c +--- linux-2.6.38.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/grsecurity/grsec_sig.c 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,197 @@ +#include +#include @@ -43734,9 +41982,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_sig.c = linux-2.6.38.3/grsecurity/grsec + return 0; + +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_sock.c linux-2.6.38.3/grsecur= ity/grsec_sock.c ---- linux-2.6.38.3/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/grsecurity/grsec_sock.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_sock.c linux-2.6.38.4/grsecur= ity/grsec_sock.c +--- linux-2.6.38.4/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/grsecurity/grsec_sock.c 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,275 @@ +#include +#include @@ -44013,9 +42261,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_sock.c= linux-2.6.38.3/grsecurity/grse + return current_cap(); +#endif +} -diff -urNp linux-2.6.38.3/grsecurity/grsec_sysctl.c linux-2.6.38.3/grsec= urity/grsec_sysctl.c ---- linux-2.6.38.3/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.0000000= 00 -0500 -+++ linux-2.6.38.3/grsecurity/grsec_sysctl.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_sysctl.c linux-2.6.38.4/grsec= urity/grsec_sysctl.c +--- linux-2.6.38.4/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.0000000= 00 -0500 ++++ linux-2.6.38.4/grsecurity/grsec_sysctl.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -0,0 +1,433 @@ +#include +#include @@ -44450,9 +42698,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_sysctl= .c linux-2.6.38.3/grsecurity/gr + { } +}; +#endif -diff -urNp linux-2.6.38.3/grsecurity/grsec_time.c linux-2.6.38.3/grsecur= ity/grsec_time.c ---- linux-2.6.38.3/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/grsecurity/grsec_time.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_time.c linux-2.6.38.4/grsecur= ity/grsec_time.c +--- linux-2.6.38.4/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/grsecurity/grsec_time.c 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,16 @@ +#include +#include @@ -44470,9 +42718,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_time.c= linux-2.6.38.3/grsecurity/grse +} + +EXPORT_SYMBOL(gr_log_timechange); -diff -urNp linux-2.6.38.3/grsecurity/grsec_tpe.c linux-2.6.38.3/grsecuri= ty/grsec_tpe.c ---- linux-2.6.38.3/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/grsecurity/grsec_tpe.c 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/grsecurity/grsec_tpe.c linux-2.6.38.4/grsecuri= ty/grsec_tpe.c +--- linux-2.6.38.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/grsecurity/grsec_tpe.c 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,39 @@ +#include +#include @@ -44513,9 +42761,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_tpe.c = linux-2.6.38.3/grsecurity/grsec +#endif + return 1; +} -diff -urNp linux-2.6.38.3/grsecurity/grsum.c linux-2.6.38.3/grsecurity/g= rsum.c ---- linux-2.6.38.3/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -050= 0 -+++ linux-2.6.38.3/grsecurity/grsum.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/grsecurity/grsum.c linux-2.6.38.4/grsecurity/g= rsum.c +--- linux-2.6.38.4/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.38.4/grsecurity/grsum.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -0,0 +1,61 @@ +#include +#include @@ -44578,9 +42826,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsum.c linu= x-2.6.38.3/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.38.3/grsecurity/Kconfig linux-2.6.38.3/grsecurity/K= config ---- linux-2.6.38.3/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -050= 0 -+++ linux-2.6.38.3/grsecurity/Kconfig 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/grsecurity/Kconfig linux-2.6.38.4/grsecurity/K= config +--- linux-2.6.38.4/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.38.4/grsecurity/Kconfig 2011-04-17 15:57:32.000000000 -040= 0 @@ -0,0 +1,1045 @@ +# +# grecurity configuration @@ -45627,9 +43875,9 @@ diff -urNp linux-2.6.38.3/grsecurity/Kconfig linu= x-2.6.38.3/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.38.3/grsecurity/Makefile linux-2.6.38.3/grsecurity/= Makefile ---- linux-2.6.38.3/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -05= 00 -+++ linux-2.6.38.3/grsecurity/Makefile 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/grsecurity/Makefile linux-2.6.38.4/grsecurity/= Makefile +--- linux-2.6.38.4/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -05= 00 ++++ linux-2.6.38.4/grsecurity/Makefile 2011-04-17 15:57:32.000000000 -04= 00 @@ -0,0 +1,29 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dal= ton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -45660,23 +43908,9 @@ diff -urNp linux-2.6.38.3/grsecurity/Makefile li= nux-2.6.38.3/grsecurity/Makefile + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.38.3/include/acpi/acoutput.h linux-2.6.38.3/include= /acpi/acoutput.h ---- linux-2.6.38.3/include/acpi/acoutput.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/acpi/acoutput.h 2011-04-17 15:57:32.000000000= -0400 -@@ -269,8 +269,8 @@ - * leaving no executable debug code! - */ - #define ACPI_FUNCTION_NAME(a) --#define ACPI_DEBUG_PRINT(pl) --#define ACPI_DEBUG_PRINT_RAW(pl) -+#define ACPI_DEBUG_PRINT(pl) do {} while (0) -+#define ACPI_DEBUG_PRINT_RAW(pl) do {} while (0) -=20 - #endif /* ACPI_DEBUG_OUTPUT */ -=20 -diff -urNp linux-2.6.38.3/include/acpi/acpi_drivers.h linux-2.6.38.3/inc= lude/acpi/acpi_drivers.h ---- linux-2.6.38.3/include/acpi/acpi_drivers.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/include/acpi/acpi_drivers.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/include/acpi/acpi_drivers.h linux-2.6.38.4/inc= lude/acpi/acpi_drivers.h +--- linux-2.6.38.4/include/acpi/acpi_drivers.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/include/acpi/acpi_drivers.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void); Dock Station ---------------------------------------------------------------------= ----- */ @@ -45706,9 +43940,9 @@ diff -urNp linux-2.6.38.3/include/acpi/acpi_drive= rs.h linux-2.6.38.3/include/acp void *context) { return -ENODEV; -diff -urNp linux-2.6.38.3/include/asm-generic/atomic-long.h linux-2.6.38= .3/include/asm-generic/atomic-long.h ---- linux-2.6.38.3/include/asm-generic/atomic-long.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/atomic-long.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/atomic-long.h linux-2.6.38= .4/include/asm-generic/atomic-long.h +--- linux-2.6.38.4/include/asm-generic/atomic-long.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/atomic-long.h 2011-04-17 15:57:32= .000000000 -0400 @@ -22,6 +22,12 @@ =20 typedef atomic64_t atomic_long_t; @@ -46001,9 +44235,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/ato= mic-long.h linux-2.6.38.3/inclu +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.38.3/include/asm-generic/dma-mapping-common.h linux= -2.6.38.3/include/asm-generic/dma-mapping-common.h ---- linux-2.6.38.3/include/asm-generic/dma-mapping-common.h 2011-03-14 2= 1:20:32.000000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/dma-mapping-common.h 2011-04-17 1= 5:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/dma-mapping-common.h linux= -2.6.38.4/include/asm-generic/dma-mapping-common.h +--- linux-2.6.38.4/include/asm-generic/dma-mapping-common.h 2011-03-14 2= 1:20:32.000000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/dma-mapping-common.h 2011-04-17 1= 5:57:32.000000000 -0400 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -46094,9 +44328,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/dma= -mapping-common.h linux-2.6.38. =20 BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.38.3/include/asm-generic/futex.h linux-2.6.38.3/inc= lude/asm-generic/futex.h ---- linux-2.6.38.3/include/asm-generic/futex.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/include/asm-generic/futex.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/futex.h linux-2.6.38.4/inc= lude/asm-generic/futex.h +--- linux-2.6.38.4/include/asm-generic/futex.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/include/asm-generic/futex.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -6,7 +6,7 @@ #include =20 @@ -46115,9 +44349,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/fut= ex.h linux-2.6.38.3/include/asm { return -ENOSYS; } -diff -urNp linux-2.6.38.3/include/asm-generic/int-l64.h linux-2.6.38.3/i= nclude/asm-generic/int-l64.h ---- linux-2.6.38.3/include/asm-generic/int-l64.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/int-l64.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/int-l64.h linux-2.6.38.4/i= nclude/asm-generic/int-l64.h +--- linux-2.6.38.4/include/asm-generic/int-l64.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/int-l64.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -46127,9 +44361,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/int= -l64.h linux-2.6.38.3/include/a #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.38.3/include/asm-generic/int-ll64.h linux-2.6.38.3/= include/asm-generic/int-ll64.h ---- linux-2.6.38.3/include/asm-generic/int-ll64.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/int-ll64.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/int-ll64.h linux-2.6.38.4/= include/asm-generic/int-ll64.h +--- linux-2.6.38.4/include/asm-generic/int-ll64.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/int-ll64.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -46139,9 +44373,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/int= -ll64.h linux-2.6.38.3/include/ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.38.3/include/asm-generic/kmap_types.h linux-2.6.38.= 3/include/asm-generic/kmap_types.h ---- linux-2.6.38.3/include/asm-generic/kmap_types.h 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/kmap_types.h 2011-04-17 15:57:32.= 000000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/kmap_types.h linux-2.6.38.= 4/include/asm-generic/kmap_types.h +--- linux-2.6.38.4/include/asm-generic/kmap_types.h 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/kmap_types.h 2011-04-17 15:57:32.= 000000000 -0400 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, KMAP_D(18) KM_NMI_PTE, @@ -46155,9 +44389,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/kma= p_types.h linux-2.6.38.3/includ }; =20 #undef KMAP_D -diff -urNp linux-2.6.38.3/include/asm-generic/pgtable.h linux-2.6.38.3/i= nclude/asm-generic/pgtable.h ---- linux-2.6.38.3/include/asm-generic/pgtable.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/pgtable.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/pgtable.h linux-2.6.38.4/i= nclude/asm-generic/pgtable.h +--- linux-2.6.38.4/include/asm-generic/pgtable.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/pgtable.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd) #endif /* __HAVE_ARCH_PMD_WRITE */ #endif @@ -46173,9 +44407,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/pgt= able.h linux-2.6.38.3/include/a #endif /* !__ASSEMBLY__ */ =20 #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.38.3/include/asm-generic/pgtable-nopmd.h linux-2.6.= 38.3/include/asm-generic/pgtable-nopmd.h ---- linux-2.6.38.3/include/asm-generic/pgtable-nopmd.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h linux-2.6.= 38.4/include/asm-generic/pgtable-nopmd.h +--- linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -46212,9 +44446,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/pgt= able-nopmd.h linux-2.6.38.3/inc /* * The "pud_xxx()" functions here are trivial for a folded two-level * setup: the pmd is never bad, and a pmd always exists (as it's folded -diff -urNp linux-2.6.38.3/include/asm-generic/pgtable-nopud.h linux-2.6.= 38.3/include/asm-generic/pgtable-nopud.h ---- linux-2.6.38.3/include/asm-generic/pgtable-nopud.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/pgtable-nopud.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopud.h linux-2.6.= 38.4/include/asm-generic/pgtable-nopud.h +--- linux-2.6.38.4/include/asm-generic/pgtable-nopud.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/pgtable-nopud.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -46245,9 +44479,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/pgt= able-nopud.h linux-2.6.38.3/inc /* * The "pgd_xxx()" functions here are trivial for a folded two-level * setup: the pud is never bad, and a pud always exists (as it's folded -diff -urNp linux-2.6.38.3/include/asm-generic/vmlinux.lds.h linux-2.6.38= .3/include/asm-generic/vmlinux.lds.h ---- linux-2.6.38.3/include/asm-generic/vmlinux.lds.h 2011-03-14 21:20:32= .000000000 -0400 -+++ linux-2.6.38.3/include/asm-generic/vmlinux.lds.h 2011-04-17 15:57:32= .000000000 -0400 +diff -urNp linux-2.6.38.4/include/asm-generic/vmlinux.lds.h linux-2.6.38= .4/include/asm-generic/vmlinux.lds.h +--- linux-2.6.38.4/include/asm-generic/vmlinux.lds.h 2011-03-14 21:20:32= .000000000 -0400 ++++ linux-2.6.38.4/include/asm-generic/vmlinux.lds.h 2011-04-17 15:57:32= .000000000 -0400 @@ -213,6 +213,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) =3D .; \ @@ -46284,115 +44518,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/v= mlinux.lds.h linux-2.6.38.3/inclu =20 /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.38.3/include/drm/drm_pciids.h linux-2.6.38.3/includ= e/drm/drm_pciids.h ---- linux-2.6.38.3/include/drm/drm_pciids.h 2011-04-18 17:27:18.00000000= 0 -0400 -+++ linux-2.6.38.3/include/drm/drm_pciids.h 2011-04-17 16:58:34.00000000= 0 -0400 -@@ -460,7 +460,7 @@ - {0x1002, 0x9805, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_ME= MMAP|RADEON_IS_IGP}, \ - {0x1002, 0x9806, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_ME= MMAP|RADEON_IS_IGP}, \ - {0x1002, 0x9807, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_ME= MMAP|RADEON_IS_IGP}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define r128_PCI_IDS \ - {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -500,14 +500,14 @@ - {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define mga_PCI_IDS \ - {0x102b, 0x0520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ - {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ - {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G400}, \ - {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G550}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define mach64_PCI_IDS \ - {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -530,7 +530,7 @@ - {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define sisdrv_PCI_IDS \ - {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -541,7 +541,7 @@ - {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ - {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define tdfx_PCI_IDS \ - {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -550,7 +550,7 @@ - {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define viadrv_PCI_IDS \ - {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -562,14 +562,14 @@ - {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \ - {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define i810_PCI_IDS \ - {0x8086, 0x7121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x7123, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x7125, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x1132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define i830_PCI_IDS \ - {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -577,11 +577,11 @@ - {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define gamma_PCI_IDS \ - {0x3d3d, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define savage_PCI_IDS \ - {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \ -@@ -607,10 +607,10 @@ - {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \ - {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ - {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define ffb_PCI_IDS \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -=20 - #define i915_PCI_IDS \ - {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0= xffff00, 0}, \ -@@ -644,4 +644,4 @@ - {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0= xffff00, 0}, \ - {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0= xffff00, 0}, \ - {0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0= xffff00, 0}, \ -- {0, 0, 0} -+ {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.38.3/include/drm/drmP.h linux-2.6.38.3/include/drm/= drmP.h ---- linux-2.6.38.3/include/drm/drmP.h 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/include/drm/drmP.h 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/include/drm/drmP.h linux-2.6.38.4/include/drm/= drmP.h +--- linux-2.6.38.4/include/drm/drmP.h 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/include/drm/drmP.h 2011-04-17 15:57:32.000000000 -040= 0 @@ -73,6 +73,7 @@ #include #include @@ -46446,9 +44574,9 @@ diff -urNp linux-2.6.38.3/include/drm/drmP.h linu= x-2.6.38.3/include/drm/drmP.h void *dev_private; /**< device private data */ void *mm_private; struct address_space *dev_mapping; -diff -urNp linux-2.6.38.3/include/linux/a.out.h linux-2.6.38.3/include/l= inux/a.out.h ---- linux-2.6.38.3/include/linux/a.out.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/a.out.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/a.out.h linux-2.6.38.4/include/l= inux/a.out.h +--- linux-2.6.38.4/include/linux/a.out.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/a.out.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 =3D 152 /* MIPS R6000/R4000 binary */ }; @@ -46464,9 +44592,9 @@ diff -urNp linux-2.6.38.3/include/linux/a.out.h l= inux-2.6.38.3/include/linux/a.o #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.38.3/include/linux/atmdev.h linux-2.6.38.3/include/= linux/atmdev.h ---- linux-2.6.38.3/include/linux/atmdev.h 2011-04-18 17:27:18.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/atmdev.h 2011-04-17 16:53:48.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/atmdev.h linux-2.6.38.4/include/= linux/atmdev.h +--- linux-2.6.38.4/include/linux/atmdev.h 2011-04-18 17:27:18.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/atmdev.h 2011-04-17 16:53:48.000000000 = -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif =20 @@ -46476,9 +44604,9 @@ diff -urNp linux-2.6.38.3/include/linux/atmdev.h = linux-2.6.38.3/include/linux/at __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.38.3/include/linux/binfmts.h linux-2.6.38.3/include= /linux/binfmts.h ---- linux-2.6.38.3/include/linux/binfmts.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/linux/binfmts.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/linux/binfmts.h linux-2.6.38.4/include= /linux/binfmts.h +--- linux-2.6.38.4/include/linux/binfmts.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/linux/binfmts.h 2011-04-17 15:57:32.000000000= -0400 @@ -92,6 +92,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -46487,9 +44615,9 @@ diff -urNp linux-2.6.38.3/include/linux/binfmts.h= linux-2.6.38.3/include/linux/b unsigned long min_coredump; /* minimal dump size */ }; =20 -diff -urNp linux-2.6.38.3/include/linux/blkdev.h linux-2.6.38.3/include/= linux/blkdev.h ---- linux-2.6.38.3/include/linux/blkdev.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/blkdev.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/blkdev.h linux-2.6.38.4/include/= linux/blkdev.h +--- linux-2.6.38.4/include/linux/blkdev.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/blkdev.h 2011-04-17 15:57:32.000000000 = -0400 @@ -1247,22 +1247,22 @@ queue_max_integrity_segments(struct requ #endif /* CONFIG_BLK_DEV_INTEGRITY */ =20 @@ -46525,9 +44653,9 @@ diff -urNp linux-2.6.38.3/include/linux/blkdev.h = linux-2.6.38.3/include/linux/bl }; =20 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsign= ed int, -diff -urNp linux-2.6.38.3/include/linux/byteorder/little_endian.h linux-= 2.6.38.3/include/linux/byteorder/little_endian.h ---- linux-2.6.38.3/include/linux/byteorder/little_endian.h 2011-03-14 21= :20:32.000000000 -0400 -+++ linux-2.6.38.3/include/linux/byteorder/little_endian.h 2011-04-17 15= :57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/include/linux/byteorder/little_endian.h linux-= 2.6.38.4/include/linux/byteorder/little_endian.h +--- linux-2.6.38.4/include/linux/byteorder/little_endian.h 2011-03-14 21= :20:32.000000000 -0400 ++++ linux-2.6.38.4/include/linux/byteorder/little_endian.h 2011-04-17 15= :57:32.000000000 -0400 @@ -42,51 +42,51 @@ =20 static inline __le64 __cpu_to_le64p(const __u64 *p) @@ -46592,9 +44720,9 @@ diff -urNp linux-2.6.38.3/include/linux/byteorder= /little_endian.h linux-2.6.38.3 } #define __cpu_to_le64s(x) do { (void)(x); } while (0) #define __le64_to_cpus(x) do { (void)(x); } while (0) -diff -urNp linux-2.6.38.3/include/linux/cache.h linux-2.6.38.3/include/l= inux/cache.h ---- linux-2.6.38.3/include/linux/cache.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/cache.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/cache.h linux-2.6.38.4/include/l= inux/cache.h +--- linux-2.6.38.4/include/linux/cache.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/cache.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -46606,9 +44734,9 @@ diff -urNp linux-2.6.38.3/include/linux/cache.h l= inux-2.6.38.3/include/linux/cac #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTE= S))) #endif -diff -urNp linux-2.6.38.3/include/linux/capability.h linux-2.6.38.3/incl= ude/linux/capability.h ---- linux-2.6.38.3/include/linux/capability.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/include/linux/capability.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/include/linux/capability.h linux-2.6.38.4/incl= ude/linux/capability.h +--- linux-2.6.38.4/include/linux/capability.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/include/linux/capability.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) =3D=3D 0) =20 @@ -46617,9 +44745,9 @@ diff -urNp linux-2.6.38.3/include/linux/capabilit= y.h linux-2.6.38.3/include/linu =20 /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.38.3/include/linux/compiler-gcc4.h linux-2.6.38.3/i= nclude/linux/compiler-gcc4.h ---- linux-2.6.38.3/include/linux/compiler-gcc4.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/include/linux/compiler-gcc4.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/include/linux/compiler-gcc4.h linux-2.6.38.4/i= nclude/linux/compiler-gcc4.h +--- linux-2.6.38.4/include/linux/compiler-gcc4.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/include/linux/compiler-gcc4.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -54,6 +54,10 @@ =20 #endif @@ -46631,9 +44759,9 @@ diff -urNp linux-2.6.38.3/include/linux/compiler-= gcc4.h linux-2.6.38.3/include/l #endif =20 #if __GNUC_MINOR__ > 0 -diff -urNp linux-2.6.38.3/include/linux/compiler.h linux-2.6.38.3/includ= e/linux/compiler.h ---- linux-2.6.38.3/include/linux/compiler.h 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/include/linux/compiler.h 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/include/linux/compiler.h linux-2.6.38.4/includ= e/linux/compiler.h +--- linux-2.6.38.4/include/linux/compiler.h 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/include/linux/compiler.h 2011-04-17 15:57:32.00000000= 0 -0400 @@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -46666,9 +44794,9 @@ diff -urNp linux-2.6.38.3/include/linux/compiler.= h linux-2.6.38.3/include/linux/ +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) =20 #endif /* __LINUX_COMPILER_H */ -diff -urNp linux-2.6.38.3/include/linux/cpuset.h linux-2.6.38.3/include/= linux/cpuset.h ---- linux-2.6.38.3/include/linux/cpuset.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/cpuset.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/cpuset.h linux-2.6.38.4/include/= linux/cpuset.h +--- linux-2.6.38.4/include/linux/cpuset.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/cpuset.h 2011-04-17 15:57:32.000000000 = -0400 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void * nodemask. */ @@ -46678,9 +44806,9 @@ diff -urNp linux-2.6.38.3/include/linux/cpuset.h = linux-2.6.38.3/include/linux/cp } =20 static inline void set_mems_allowed(nodemask_t nodemask) -diff -urNp linux-2.6.38.3/include/linux/decompress/mm.h linux-2.6.38.3/i= nclude/linux/decompress/mm.h ---- linux-2.6.38.3/include/linux/decompress/mm.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/include/linux/decompress/mm.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/include/linux/decompress/mm.h linux-2.6.38.4/i= nclude/linux/decompress/mm.h +--- linux-2.6.38.4/include/linux/decompress/mm.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/include/linux/decompress/mm.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -77,7 +77,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -46690,9 +44818,9 @@ diff -urNp linux-2.6.38.3/include/linux/decompres= s/mm.h linux-2.6.38.3/include/l #define free(a) kfree(a) =20 #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.38.3/include/linux/dma-mapping.h linux-2.6.38.3/inc= lude/linux/dma-mapping.h ---- linux-2.6.38.3/include/linux/dma-mapping.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/include/linux/dma-mapping.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/include/linux/dma-mapping.h linux-2.6.38.4/inc= lude/linux/dma-mapping.h +--- linux-2.6.38.4/include/linux/dma-mapping.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/include/linux/dma-mapping.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -16,40 +16,40 @@ enum dma_data_direction { }; =20 @@ -46748,9 +44876,9 @@ diff -urNp linux-2.6.38.3/include/linux/dma-mappi= ng.h linux-2.6.38.3/include/lin }; =20 #define DMA_BIT_MASK(n) (((n) =3D=3D 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.38.3/include/linux/elf.h linux-2.6.38.3/include/lin= ux/elf.h ---- linux-2.6.38.3/include/linux/elf.h 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/include/linux/elf.h 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/include/linux/elf.h linux-2.6.38.4/include/lin= ux/elf.h +--- linux-2.6.38.4/include/linux/elf.h 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/include/linux/elf.h 2011-04-17 15:57:32.000000000 -04= 00 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 =20 @@ -46823,9 +44951,9 @@ diff -urNp linux-2.6.38.3/include/linux/elf.h lin= ux-2.6.38.3/include/linux/elf.h =20 #endif =20 -diff -urNp linux-2.6.38.3/include/linux/fs.h linux-2.6.38.3/include/linu= x/fs.h ---- linux-2.6.38.3/include/linux/fs.h 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/include/linux/fs.h 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/include/linux/fs.h linux-2.6.38.4/include/linu= x/fs.h +--- linux-2.6.38.4/include/linux/fs.h 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/include/linux/fs.h 2011-04-17 15:57:32.000000000 -040= 0 @@ -105,6 +105,11 @@ struct inodes_stat_t { /* File was opened by fanotify and shouldn't generate fanotify events *= / #define FMODE_NONOTIFY ((__force fmode_t)0x1000000) @@ -46974,9 +45102,9 @@ diff -urNp linux-2.6.38.3/include/linux/fs.h linu= x-2.6.38.3/include/linux/fs.h }; =20 /* -diff -urNp linux-2.6.38.3/include/linux/fs_struct.h linux-2.6.38.3/inclu= de/linux/fs_struct.h ---- linux-2.6.38.3/include/linux/fs_struct.h 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/include/linux/fs_struct.h 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/include/linux/fs_struct.h linux-2.6.38.4/inclu= de/linux/fs_struct.h +--- linux-2.6.38.4/include/linux/fs_struct.h 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/include/linux/fs_struct.h 2011-04-17 15:57:32.0000000= 00 -0400 @@ -6,7 +6,7 @@ #include =20 @@ -46986,9 +45114,9 @@ diff -urNp linux-2.6.38.3/include/linux/fs_struct= .h linux-2.6.38.3/include/linux spinlock_t lock; seqcount_t seq; int umask; -diff -urNp linux-2.6.38.3/include/linux/genhd.h linux-2.6.38.3/include/l= inux/genhd.h ---- linux-2.6.38.3/include/linux/genhd.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/genhd.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/genhd.h linux-2.6.38.4/include/l= inux/genhd.h +--- linux-2.6.38.4/include/linux/genhd.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/genhd.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -183,7 +183,7 @@ struct gendisk { struct kobject *slave_dir; =20 @@ -46998,9 +45126,9 @@ diff -urNp linux-2.6.38.3/include/linux/genhd.h l= inux-2.6.38.3/include/linux/gen struct disk_events *ev; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.38.3/include/linux/gracl.h linux-2.6.38.3/include/l= inux/gracl.h ---- linux-2.6.38.3/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.38.3/include/linux/gracl.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/gracl.h linux-2.6.38.4/include/l= inux/gracl.h +--- linux-2.6.38.4/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -= 0500 ++++ linux-2.6.38.4/include/linux/gracl.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -0,0 +1,317 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -47319,9 +45447,9 @@ diff -urNp linux-2.6.38.3/include/linux/gracl.h l= inux-2.6.38.3/include/linux/gra + +#endif + -diff -urNp linux-2.6.38.3/include/linux/gralloc.h linux-2.6.38.3/include= /linux/gralloc.h ---- linux-2.6.38.3/include/linux/gralloc.h 1969-12-31 19:00:00.000000000= -0500 -+++ linux-2.6.38.3/include/linux/gralloc.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/linux/gralloc.h linux-2.6.38.4/include= /linux/gralloc.h +--- linux-2.6.38.4/include/linux/gralloc.h 1969-12-31 19:00:00.000000000= -0500 ++++ linux-2.6.38.4/include/linux/gralloc.h 2011-04-17 15:57:32.000000000= -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -47332,9 +45460,9 @@ diff -urNp linux-2.6.38.3/include/linux/gralloc.h= linux-2.6.38.3/include/linux/g +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.38.3/include/linux/grdefs.h linux-2.6.38.3/include/= linux/grdefs.h ---- linux-2.6.38.3/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/include/linux/grdefs.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/grdefs.h linux-2.6.38.4/include/= linux/grdefs.h +--- linux-2.6.38.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/include/linux/grdefs.h 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,139 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -47475,9 +45603,9 @@ diff -urNp linux-2.6.38.3/include/linux/grdefs.h = linux-2.6.38.3/include/linux/gr +}; + +#endif -diff -urNp linux-2.6.38.3/include/linux/grinternal.h linux-2.6.38.3/incl= ude/linux/grinternal.h ---- linux-2.6.38.3/include/linux/grinternal.h 1969-12-31 19:00:00.000000= 000 -0500 -+++ linux-2.6.38.3/include/linux/grinternal.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/include/linux/grinternal.h linux-2.6.38.4/incl= ude/linux/grinternal.h +--- linux-2.6.38.4/include/linux/grinternal.h 1969-12-31 19:00:00.000000= 000 -0500 ++++ linux-2.6.38.4/include/linux/grinternal.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -0,0 +1,219 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -47698,9 +45826,9 @@ diff -urNp linux-2.6.38.3/include/linux/grinterna= l.h linux-2.6.38.3/include/linu +#endif + +#endif -diff -urNp linux-2.6.38.3/include/linux/grmsg.h linux-2.6.38.3/include/l= inux/grmsg.h ---- linux-2.6.38.3/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -= 0500 -+++ linux-2.6.38.3/include/linux/grmsg.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/grmsg.h linux-2.6.38.4/include/l= inux/grmsg.h +--- linux-2.6.38.4/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -= 0500 ++++ linux-2.6.38.4/include/linux/grmsg.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -0,0 +1,108 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, = parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/eui= d:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %= us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/= euid:%u/%u gid/egid:%u/%u" @@ -47810,9 +45938,9 @@ diff -urNp linux-2.6.38.3/include/linux/grmsg.h l= inux-2.6.38.3/include/linux/grm +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via p= trace by " +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privi= lege to init by " -diff -urNp linux-2.6.38.3/include/linux/grsecurity.h linux-2.6.38.3/incl= ude/linux/grsecurity.h ---- linux-2.6.38.3/include/linux/grsecurity.h 1969-12-31 19:00:00.000000= 000 -0500 -+++ linux-2.6.38.3/include/linux/grsecurity.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/include/linux/grsecurity.h linux-2.6.38.4/incl= ude/linux/grsecurity.h +--- linux-2.6.38.4/include/linux/grsecurity.h 1969-12-31 19:00:00.000000= 000 -0500 ++++ linux-2.6.38.4/include/linux/grsecurity.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -0,0 +1,212 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -48026,9 +46154,9 @@ diff -urNp linux-2.6.38.3/include/linux/grsecurit= y.h linux-2.6.38.3/include/linu +#endif + +#endif -diff -urNp linux-2.6.38.3/include/linux/grsock.h linux-2.6.38.3/include/= linux/grsock.h ---- linux-2.6.38.3/include/linux/grsock.h 1969-12-31 19:00:00.000000000 = -0500 -+++ linux-2.6.38.3/include/linux/grsock.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/grsock.h linux-2.6.38.4/include/= linux/grsock.h +--- linux-2.6.38.4/include/linux/grsock.h 1969-12-31 19:00:00.000000000 = -0500 ++++ linux-2.6.38.4/include/linux/grsock.h 2011-04-17 15:57:32.000000000 = -0400 @@ -0,0 +1,19 @@ +#ifndef __GRSOCK_H +#define __GRSOCK_H @@ -48049,9 +46177,9 @@ diff -urNp linux-2.6.38.3/include/linux/grsock.h = linux-2.6.38.3/include/linux/gr + const int protocol); + +#endif -diff -urNp linux-2.6.38.3/include/linux/highmem.h linux-2.6.38.3/include= /linux/highmem.h ---- linux-2.6.38.3/include/linux/highmem.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/linux/highmem.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/linux/highmem.h linux-2.6.38.4/include= /linux/highmem.h +--- linux-2.6.38.4/include/linux/highmem.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/linux/highmem.h 2011-04-17 15:57:32.000000000= -0400 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -48071,9 +46199,9 @@ diff -urNp linux-2.6.38.3/include/linux/highmem.h= linux-2.6.38.3/include/linux/h static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.38.3/include/linux/init.h linux-2.6.38.3/include/li= nux/init.h ---- linux-2.6.38.3/include/linux/init.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/include/linux/init.h 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/include/linux/init.h linux-2.6.38.4/include/li= nux/init.h +--- linux-2.6.38.4/include/linux/init.h 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/include/linux/init.h 2011-04-17 15:57:32.000000000 -0= 400 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm =20 /* Each module must use one module_init(). */ @@ -48090,9 +46218,9 @@ diff -urNp linux-2.6.38.3/include/linux/init.h li= nux-2.6.38.3/include/linux/init { return exitfn; } \ void cleanup_module(void) __attribute__((alias(#exitfn))); =20 -diff -urNp linux-2.6.38.3/include/linux/init_task.h linux-2.6.38.3/inclu= de/linux/init_task.h ---- linux-2.6.38.3/include/linux/init_task.h 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/include/linux/init_task.h 2011-04-18 18:02:13.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/include/linux/init_task.h linux-2.6.38.4/inclu= de/linux/init_task.h +--- linux-2.6.38.4/include/linux/init_task.h 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/include/linux/init_task.h 2011-04-18 18:02:13.0000000= 00 -0400 @@ -83,6 +83,12 @@ extern struct group_info init_groups; #define INIT_IDS #endif @@ -48114,9 +46242,9 @@ diff -urNp linux-2.6.38.3/include/linux/init_task= .h linux-2.6.38.3/include/linux .fs =3D &init_fs, \ .files =3D &init_files, \ .signal =3D &init_signals, \ -diff -urNp linux-2.6.38.3/include/linux/interrupt.h linux-2.6.38.3/inclu= de/linux/interrupt.h ---- linux-2.6.38.3/include/linux/interrupt.h 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/include/linux/interrupt.h 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/include/linux/interrupt.h linux-2.6.38.4/inclu= de/linux/interrupt.h +--- linux-2.6.38.4/include/linux/interrupt.h 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/include/linux/interrupt.h 2011-04-17 15:57:32.0000000= 00 -0400 @@ -393,7 +393,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -48141,33 +46269,9 @@ diff -urNp linux-2.6.38.3/include/linux/interrup= t.h linux-2.6.38.3/include/linux extern void softirq_init(void); static inline void __raise_softirq_irqoff(unsigned int nr) { -diff -urNp linux-2.6.38.3/include/linux/jbd2.h linux-2.6.38.3/include/li= nux/jbd2.h ---- linux-2.6.38.3/include/linux/jbd2.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/include/linux/jbd2.h 2011-04-17 15:57:32.000000000 -0= 400 -@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug; - } \ - } while (0) - #else --#define jbd_debug(f, a...) /**/ -+#define jbd_debug(f, a...) do {} while (0) - #endif -=20 - extern void *jbd2_alloc(size_t size, gfp_t flags); -diff -urNp linux-2.6.38.3/include/linux/jbd.h linux-2.6.38.3/include/lin= ux/jbd.h ---- linux-2.6.38.3/include/linux/jbd.h 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/include/linux/jbd.h 2011-04-17 15:57:32.000000000 -04= 00 -@@ -67,7 +67,7 @@ extern u8 journal_enable_debug; - } \ - } while (0) - #else --#define jbd_debug(f, a...) /**/ -+#define jbd_debug(f, a...) do {} while (0) - #endif -=20 - static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.38.3/include/linux/kallsyms.h linux-2.6.38.3/includ= e/linux/kallsyms.h ---- linux-2.6.38.3/include/linux/kallsyms.h 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/include/linux/kallsyms.h 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/include/linux/kallsyms.h linux-2.6.38.4/includ= e/linux/kallsyms.h +--- linux-2.6.38.4/include/linux/kallsyms.h 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/include/linux/kallsyms.h 2011-04-17 15:57:32.00000000= 0 -0400 @@ -15,7 +15,8 @@ =20 struct module; @@ -48194,9 +46298,9 @@ diff -urNp linux-2.6.38.3/include/linux/kallsyms.= h linux-2.6.38.3/include/linux/ =20 /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.38.3/include/linux/kgdb.h linux-2.6.38.3/include/li= nux/kgdb.h ---- linux-2.6.38.3/include/linux/kgdb.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/include/linux/kgdb.h 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/include/linux/kgdb.h linux-2.6.38.4/include/li= nux/kgdb.h +--- linux-2.6.38.4/include/linux/kgdb.h 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/include/linux/kgdb.h 2011-04-17 15:57:32.000000000 -0= 400 @@ -269,22 +269,22 @@ struct kgdb_arch { */ struct kgdb_io { @@ -48230,9 +46334,9 @@ diff -urNp linux-2.6.38.3/include/linux/kgdb.h li= nux-2.6.38.3/include/linux/kgdb =20 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern char *kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.38.3/include/linux/kmod.h linux-2.6.38.3/include/li= nux/kmod.h ---- linux-2.6.38.3/include/linux/kmod.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/include/linux/kmod.h 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/include/linux/kmod.h linux-2.6.38.4/include/li= nux/kmod.h +--- linux-2.6.38.4/include/linux/kmod.h 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/include/linux/kmod.h 2011-04-17 15:57:32.000000000 -0= 400 @@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysc * usually useless though. */ extern int __request_module(bool wait, const char *name, ...) \ @@ -48242,9 +46346,9 @@ diff -urNp linux-2.6.38.3/include/linux/kmod.h li= nux-2.6.38.3/include/linux/kmod #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ -diff -urNp linux-2.6.38.3/include/linux/kvm_host.h linux-2.6.38.3/includ= e/linux/kvm_host.h ---- linux-2.6.38.3/include/linux/kvm_host.h 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/include/linux/kvm_host.h 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/include/linux/kvm_host.h linux-2.6.38.4/includ= e/linux/kvm_host.h +--- linux-2.6.38.4/include/linux/kvm_host.h 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/include/linux/kvm_host.h 2011-04-17 15:57:32.00000000= 0 -0400 @@ -288,7 +288,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -48263,24 +46367,9 @@ diff -urNp linux-2.6.38.3/include/linux/kvm_host= .h linux-2.6.38.3/include/linux/ void kvm_arch_exit(void); =20 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.38.3/include/linux/libata.h linux-2.6.38.3/include/= linux/libata.h ---- linux-2.6.38.3/include/linux/libata.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/libata.h 2011-04-17 15:57:32.000000000 = -0400 -@@ -65,11 +65,11 @@ - #ifdef ATA_VERBOSE_DEBUG - #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## = args) - #else --#define VPRINTK(fmt, args...) -+#define VPRINTK(fmt, args...) do {} while (0) - #endif /* ATA_VERBOSE_DEBUG */ - #else --#define DPRINTK(fmt, args...) --#define VPRINTK(fmt, args...) -+#define DPRINTK(fmt, args...) do {} while (0) -+#define VPRINTK(fmt, args...) do {} while (0) - #endif /* ATA_DEBUG */ -=20 - #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk= (KERN_ERR "%s: " fmt, __func__, ## args) +diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/= linux/libata.h +--- linux-2.6.38.4/include/linux/libata.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/libata.h 2011-04-23 12:47:28.000000000 = -0400 @@ -530,11 +530,11 @@ struct ata_ioports { =20 struct ata_host { @@ -48331,9 +46420,9 @@ diff -urNp linux-2.6.38.3/include/linux/libata.h = linux-2.6.38.3/include/linux/li extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user= *arg); extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd= ); -diff -urNp linux-2.6.38.3/include/linux/lockd/bind.h linux-2.6.38.3/incl= ude/linux/lockd/bind.h ---- linux-2.6.38.3/include/linux/lockd/bind.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/include/linux/lockd/bind.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/include/linux/lockd/bind.h linux-2.6.38.4/incl= ude/linux/lockd/bind.h +--- linux-2.6.38.4/include/linux/lockd/bind.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/include/linux/lockd/bind.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -48351,9 +46440,9 @@ diff -urNp linux-2.6.38.3/include/linux/lockd/bin= d.h linux-2.6.38.3/include/linu =20 /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.38.3/include/linux/mm.h linux-2.6.38.3/include/linu= x/mm.h ---- linux-2.6.38.3/include/linux/mm.h 2011-04-18 17:27:16.000000000 -040= 0 -+++ linux-2.6.38.3/include/linux/mm.h 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linu= x/mm.h +--- linux-2.6.38.4/include/linux/mm.h 2011-04-18 17:27:16.000000000 -040= 0 ++++ linux-2.6.38.4/include/linux/mm.h 2011-04-17 15:57:32.000000000 -040= 0 @@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void=20 =20 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pag= es */ @@ -48454,9 +46543,9 @@ diff -urNp linux-2.6.38.3/include/linux/mm.h linu= x-2.6.38.3/include/linux/mm.h + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.38.3/include/linux/mm_types.h linux-2.6.38.3/includ= e/linux/mm_types.h ---- linux-2.6.38.3/include/linux/mm_types.h 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/include/linux/mm_types.h 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/include/linux/mm_types.h linux-2.6.38.4/includ= e/linux/mm_types.h +--- linux-2.6.38.4/include/linux/mm_types.h 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/include/linux/mm_types.h 2011-04-17 15:57:32.00000000= 0 -0400 @@ -183,6 +183,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -48491,9 +46580,9 @@ diff -urNp linux-2.6.38.3/include/linux/mm_types.= h linux-2.6.38.3/include/linux/ }; =20 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.38.3/include/linux/mmu_notifier.h linux-2.6.38.3/in= clude/linux/mmu_notifier.h ---- linux-2.6.38.3/include/linux/mmu_notifier.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/include/linux/mmu_notifier.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/include/linux/mmu_notifier.h linux-2.6.38.4/in= clude/linux/mmu_notifier.h +--- linux-2.6.38.4/include/linux/mmu_notifier.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/include/linux/mmu_notifier.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -48510,9 +46599,9 @@ diff -urNp linux-2.6.38.3/include/linux/mmu_notif= ier.h linux-2.6.38.3/include/li }) =20 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \ -diff -urNp linux-2.6.38.3/include/linux/mmzone.h linux-2.6.38.3/include/= linux/mmzone.h ---- linux-2.6.38.3/include/linux/mmzone.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/mmzone.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/mmzone.h linux-2.6.38.4/include/= linux/mmzone.h +--- linux-2.6.38.4/include/linux/mmzone.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/mmzone.h 2011-04-17 15:57:32.000000000 = -0400 @@ -355,7 +355,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ =20 @@ -48522,9 +46611,9 @@ diff -urNp linux-2.6.38.3/include/linux/mmzone.h = linux-2.6.38.3/include/linux/mm =20 /* * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on -diff -urNp linux-2.6.38.3/include/linux/mod_devicetable.h linux-2.6.38.3= /include/linux/mod_devicetable.h ---- linux-2.6.38.3/include/linux/mod_devicetable.h 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/include/linux/mod_devicetable.h 2011-04-17 15:57:32.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/include/linux/mod_devicetable.h linux-2.6.38.4= /include/linux/mod_devicetable.h +--- linux-2.6.38.4/include/linux/mod_devicetable.h 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/include/linux/mod_devicetable.h 2011-04-17 15:57:32.0= 00000000 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -48543,9 +46632,9 @@ diff -urNp linux-2.6.38.3/include/linux/mod_devic= etable.h linux-2.6.38.3/include =20 struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.38.3/include/linux/module.h linux-2.6.38.3/include/= linux/module.h ---- linux-2.6.38.3/include/linux/module.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/module.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/module.h linux-2.6.38.4/include/= linux/module.h +--- linux-2.6.38.4/include/linux/module.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/module.h 2011-04-17 15:57:32.000000000 = -0400 @@ -324,19 +324,16 @@ struct module int (*init)(void); =20 @@ -48621,9 +46710,9 @@ diff -urNp linux-2.6.38.3/include/linux/module.h = linux-2.6.38.3/include/linux/mo } =20 /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.38.3/include/linux/moduleloader.h linux-2.6.38.3/in= clude/linux/moduleloader.h ---- linux-2.6.38.3/include/linux/moduleloader.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/include/linux/moduleloader.h 2011-04-17 15:57:32.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/include/linux/moduleloader.h linux-2.6.38.4/in= clude/linux/moduleloader.h +--- linux-2.6.38.4/include/linux/moduleloader.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/include/linux/moduleloader.h 2011-04-17 15:57:32.0000= 00000 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -48646,9 +46735,9 @@ diff -urNp linux-2.6.38.3/include/linux/moduleloa= der.h linux-2.6.38.3/include/li /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.38.3/include/linux/moduleparam.h linux-2.6.38.3/inc= lude/linux/moduleparam.h ---- linux-2.6.38.3/include/linux/moduleparam.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/include/linux/moduleparam.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/include/linux/moduleparam.h linux-2.6.38.4/inc= lude/linux/moduleparam.h +--- linux-2.6.38.4/include/linux/moduleparam.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/include/linux/moduleparam.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock * @len is usually just sizeof(string). */ @@ -48667,9 +46756,9 @@ diff -urNp linux-2.6.38.3/include/linux/modulepar= am.h linux-2.6.38.3/include/lin =3D { ARRAY_SIZE(array), nump, ¶m_ops_##type, \ sizeof(array[0]), array }; \ __module_param_call(MODULE_PARAM_PREFIX, name, \ -diff -urNp linux-2.6.38.3/include/linux/mutex.h linux-2.6.38.3/include/l= inux/mutex.h ---- linux-2.6.38.3/include/linux/mutex.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/mutex.h 2011-04-17 17:44:37.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/mutex.h linux-2.6.38.4/include/l= inux/mutex.h +--- linux-2.6.38.4/include/linux/mutex.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/mutex.h 2011-04-17 17:44:37.000000000 -= 0400 @@ -51,7 +51,7 @@ struct mutex { spinlock_t wait_lock; struct list_head wait_list; @@ -48679,9 +46768,9 @@ diff -urNp linux-2.6.38.3/include/linux/mutex.h l= inux-2.6.38.3/include/linux/mut #endif #ifdef CONFIG_DEBUG_MUTEXES const char *name; -diff -urNp linux-2.6.38.3/include/linux/namei.h linux-2.6.38.3/include/l= inux/namei.h ---- linux-2.6.38.3/include/linux/namei.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/namei.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/namei.h linux-2.6.38.4/include/l= inux/namei.h +--- linux-2.6.38.4/include/linux/namei.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/namei.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -25,7 +25,7 @@ struct nameidata { unsigned seq; int last_type; @@ -48706,9 +46795,9 @@ diff -urNp linux-2.6.38.3/include/linux/namei.h l= inux-2.6.38.3/include/linux/nam { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.38.3/include/linux/netfilter/xt_gradm.h linux-2.6.3= 8.3/include/linux/netfilter/xt_gradm.h ---- linux-2.6.38.3/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:0= 0.000000000 -0500 -+++ linux-2.6.38.3/include/linux/netfilter/xt_gradm.h 2011-04-17 15:57:3= 2.000000000 -0400 +diff -urNp linux-2.6.38.4/include/linux/netfilter/xt_gradm.h linux-2.6.3= 8.4/include/linux/netfilter/xt_gradm.h +--- linux-2.6.38.4/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:0= 0.000000000 -0500 ++++ linux-2.6.38.4/include/linux/netfilter/xt_gradm.h 2011-04-17 15:57:3= 2.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef _LINUX_NETFILTER_XT_GRADM_H +#define _LINUX_NETFILTER_XT_GRADM_H 1 @@ -48719,9 +46808,9 @@ diff -urNp linux-2.6.38.3/include/linux/netfilter= /xt_gradm.h linux-2.6.38.3/incl +}; + +#endif -diff -urNp linux-2.6.38.3/include/linux/oprofile.h linux-2.6.38.3/includ= e/linux/oprofile.h ---- linux-2.6.38.3/include/linux/oprofile.h 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/include/linux/oprofile.h 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/include/linux/oprofile.h linux-2.6.38.4/includ= e/linux/oprofile.h +--- linux-2.6.38.4/include/linux/oprofile.h 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/include/linux/oprofile.h 2011-04-17 15:57:32.00000000= 0 -0400 @@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry *= root, char const * name, ulong * val); @@ -48734,21 +46823,9 @@ diff -urNp linux-2.6.38.3/include/linux/oprofile= .h linux-2.6.38.3/include/linux/ =20 /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry= * root, -diff -urNp linux-2.6.38.3/include/linux/pid.h linux-2.6.38.3/include/lin= ux/pid.h ---- linux-2.6.38.3/include/linux/pid.h 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/include/linux/pid.h 2011-04-18 19:21:21.000000000 -04= 00 -@@ -117,7 +117,7 @@ extern struct pid *find_vpid(int nr); - */ - extern struct pid *find_get_pid(int nr); - extern struct pid *find_ge_pid(int nr, struct pid_namespace *); --int next_pidmap(struct pid_namespace *pid_ns, int last); -+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last); -=20 - extern struct pid *alloc_pid(struct pid_namespace *ns); - extern void free_pid(struct pid *pid); -diff -urNp linux-2.6.38.3/include/linux/pipe_fs_i.h linux-2.6.38.3/inclu= de/linux/pipe_fs_i.h ---- linux-2.6.38.3/include/linux/pipe_fs_i.h 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/include/linux/pipe_fs_i.h 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/include/linux/pipe_fs_i.h linux-2.6.38.4/inclu= de/linux/pipe_fs_i.h +--- linux-2.6.38.4/include/linux/pipe_fs_i.h 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/include/linux/pipe_fs_i.h 2011-04-17 15:57:32.0000000= 00 -0400 @@ -46,9 +46,9 @@ struct pipe_buffer { struct pipe_inode_info { wait_queue_head_t wait; @@ -48762,9 +46839,9 @@ diff -urNp linux-2.6.38.3/include/linux/pipe_fs_i= .h linux-2.6.38.3/include/linux unsigned int r_counter; unsigned int w_counter; struct page *tmp_page; -diff -urNp linux-2.6.38.3/include/linux/pm_runtime.h linux-2.6.38.3/incl= ude/linux/pm_runtime.h ---- linux-2.6.38.3/include/linux/pm_runtime.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/include/linux/pm_runtime.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/include/linux/pm_runtime.h linux-2.6.38.4/incl= ude/linux/pm_runtime.h +--- linux-2.6.38.4/include/linux/pm_runtime.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/include/linux/pm_runtime.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -89,7 +89,7 @@ static inline bool pm_runtime_enabled(st =20 static inline void pm_runtime_mark_last_busy(struct device *dev) @@ -48774,9 +46851,9 @@ diff -urNp linux-2.6.38.3/include/linux/pm_runtim= e.h linux-2.6.38.3/include/linu } =20 #else /* !CONFIG_PM_RUNTIME */ -diff -urNp linux-2.6.38.3/include/linux/poison.h linux-2.6.38.3/include/= linux/poison.h ---- linux-2.6.38.3/include/linux/poison.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/poison.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/poison.h linux-2.6.38.4/include/= linux/poison.h +--- linux-2.6.38.4/include/linux/poison.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/poison.h 2011-04-17 15:57:32.000000000 = -0400 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -48788,9 +46865,9 @@ diff -urNp linux-2.6.38.3/include/linux/poison.h = linux-2.6.38.3/include/linux/po =20 /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.38.3/include/linux/proc_fs.h linux-2.6.38.3/include= /linux/proc_fs.h ---- linux-2.6.38.3/include/linux/proc_fs.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/linux/proc_fs.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/linux/proc_fs.h linux-2.6.38.4/include= /linux/proc_fs.h +--- linux-2.6.38.4/include/linux/proc_fs.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/linux/proc_fs.h 2011-04-17 15:57:32.000000000= -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -48811,9 +46888,9 @@ diff -urNp linux-2.6.38.3/include/linux/proc_fs.h= linux-2.6.38.3/include/linux/p static inline struct proc_dir_entry *create_proc_read_entry(const char = *name, mode_t mode, struct proc_dir_entry *base,=20 read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.38.3/include/linux/ptrace.h linux-2.6.38.3/include/= linux/ptrace.h ---- linux-2.6.38.3/include/linux/ptrace.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/ptrace.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/ptrace.h linux-2.6.38.4/include/= linux/ptrace.h +--- linux-2.6.38.4/include/linux/ptrace.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/ptrace.h 2011-04-17 15:57:32.000000000 = -0400 @@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_ extern void exit_ptrace(struct task_struct *tracer); #define PTRACE_MODE_READ 1 @@ -48827,9 +46904,9 @@ diff -urNp linux-2.6.38.3/include/linux/ptrace.h = linux-2.6.38.3/include/linux/pt =20 static inline int ptrace_reparented(struct task_struct *child) { -diff -urNp linux-2.6.38.3/include/linux/random.h linux-2.6.38.3/include/= linux/random.h ---- linux-2.6.38.3/include/linux/random.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/random.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/random.h linux-2.6.38.4/include/= linux/random.h +--- linux-2.6.38.4/include/linux/random.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/random.h 2011-04-17 15:57:32.000000000 = -0400 @@ -80,12 +80,17 @@ void srandom32(u32 seed); =20 u32 prandom32(struct rnd_state *); @@ -48849,9 +46926,9 @@ diff -urNp linux-2.6.38.3/include/linux/random.h = linux-2.6.38.3/include/linux/ra } =20 /** -diff -urNp linux-2.6.38.3/include/linux/reiserfs_fs.h linux-2.6.38.3/inc= lude/linux/reiserfs_fs.h ---- linux-2.6.38.3/include/linux/reiserfs_fs.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/include/linux/reiserfs_fs.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs.h linux-2.6.38.4/inc= lude/linux/reiserfs_fs.h +--- linux-2.6.38.4/include/linux/reiserfs_fs.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/include/linux/reiserfs_fs.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ =20 @@ -48898,9 +46975,9 @@ diff -urNp linux-2.6.38.3/include/linux/reiserfs_= fs.h linux-2.6.38.3/include/lin =20 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_t= ype (ih)]->bytes_number (ih, bsize) #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_= type (le_key_version (key), key)]->is_left_mergeable (key, bsize) -diff -urNp linux-2.6.38.3/include/linux/reiserfs_fs_sb.h linux-2.6.38.3/= include/linux/reiserfs_fs_sb.h ---- linux-2.6.38.3/include/linux/reiserfs_fs_sb.h 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/include/linux/reiserfs_fs_sb.h 2011-04-17 15:57:32.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs_sb.h linux-2.6.38.4/= include/linux/reiserfs_fs_sb.h +--- linux-2.6.38.4/include/linux/reiserfs_fs_sb.h 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/include/linux/reiserfs_fs_sb.h 2011-04-17 15:57:32.00= 0000000 -0400 @@ -386,7 +386,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -48910,9 +46987,9 @@ diff -urNp linux-2.6.38.3/include/linux/reiserfs_= fs_sb.h linux-2.6.38.3/include/ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.38.3/include/linux/rmap.h linux-2.6.38.3/include/li= nux/rmap.h ---- linux-2.6.38.3/include/linux/rmap.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/include/linux/rmap.h 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/include/linux/rmap.h linux-2.6.38.4/include/li= nux/rmap.h +--- linux-2.6.38.4/include/linux/rmap.h 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/include/linux/rmap.h 2011-04-17 15:57:32.000000000 -0= 400 @@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc void anon_vma_init(void); /* create anon_vma_cachep */ int anon_vma_prepare(struct vm_area_struct *); @@ -48924,9 +47001,9 @@ diff -urNp linux-2.6.38.3/include/linux/rmap.h li= nux-2.6.38.3/include/linux/rmap void __anon_vma_link(struct vm_area_struct *); void anon_vma_free(struct anon_vma *); =20 -diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/l= inux/sched.h ---- linux-2.6.38.3/include/linux/sched.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/sched.h 2011-04-18 22:03:12.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/l= inux/sched.h +--- linux-2.6.38.4/include/linux/sched.h 2011-04-22 19:20:59.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/sched.h 2011-04-22 19:21:35.000000000 -= 0400 @@ -99,6 +99,7 @@ struct robust_list_head; struct bio_list; struct fs_struct; @@ -48988,7 +47065,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch /* Hash table maintenance information */ struct hlist_node uidhash_node; uid_t uid; -@@ -1307,8 +1327,8 @@ struct task_struct { +@@ -1310,8 +1330,8 @@ struct task_struct { struct list_head thread_group; =20 struct completion *vfork_done; /* for vfork() */ @@ -48999,7 +47076,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch =20 cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; -@@ -1324,13 +1344,6 @@ struct task_struct { +@@ -1327,13 +1347,6 @@ struct task_struct { struct task_cputime cputime_expires; struct list_head cpu_timers[3]; =20 @@ -49013,7 +47090,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch char comm[TASK_COMM_LEN]; /* executable name excluding path - access with [gs]et_task_comm (which lock it with task_lock()) -@@ -1347,8 +1360,16 @@ struct task_struct { +@@ -1350,8 +1363,16 @@ struct task_struct { #endif /* CPU-specific state of this task */ struct thread_struct thread; @@ -49030,7 +47107,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch /* open file information */ struct files_struct *files; /* namespaces */ -@@ -1395,6 +1416,11 @@ struct task_struct { +@@ -1398,6 +1419,11 @@ struct task_struct { struct rt_mutex_waiter *pi_blocked_on; #endif =20 @@ -49042,7 +47119,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch #ifdef CONFIG_DEBUG_MUTEXES /* mutex deadlock detection */ struct mutex_waiter *blocked_on; -@@ -1499,6 +1525,21 @@ struct task_struct { +@@ -1502,6 +1528,21 @@ struct task_struct { unsigned long default_timer_slack_ns; =20 struct list_head *scm_work_list; @@ -49064,7 +47141,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch #ifdef CONFIG_FUNCTION_GRAPH_TRACER /* Index of current stored address in ret_stack */ int curr_ret_stack; -@@ -1530,6 +1571,51 @@ struct task_struct { +@@ -1533,6 +1574,51 @@ struct task_struct { #endif }; =20 @@ -49116,7 +47193,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) =20 -@@ -1999,7 +2085,9 @@ void yield(void); +@@ -2002,7 +2088,9 @@ void yield(void); extern struct exec_domain default_exec_domain; =20 union thread_union { @@ -49126,7 +47203,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch unsigned long stack[THREAD_SIZE/sizeof(long)]; }; =20 -@@ -2169,7 +2257,7 @@ extern void __cleanup_sighand(struct sig +@@ -2172,7 +2260,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); =20 @@ -49135,7 +47212,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch =20 extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2310,13 +2398,17 @@ static inline unsigned long *end_of_stac +@@ -2313,13 +2401,17 @@ static inline unsigned long *end_of_stac =20 #endif =20 @@ -49155,9 +47232,9 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h l= inux-2.6.38.3/include/linux/sch extern void thread_info_cache_init(void); =20 #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.38.3/include/linux/screen_info.h linux-2.6.38.3/inc= lude/linux/screen_info.h ---- linux-2.6.38.3/include/linux/screen_info.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/include/linux/screen_info.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/include/linux/screen_info.h linux-2.6.38.4/inc= lude/linux/screen_info.h +--- linux-2.6.38.4/include/linux/screen_info.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/include/linux/screen_info.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -43,7 +43,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -49168,9 +47245,9 @@ diff -urNp linux-2.6.38.3/include/linux/screen_in= fo.h linux-2.6.38.3/include/lin } __attribute__((packed)); =20 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.38.3/include/linux/security.h linux-2.6.38.3/includ= e/linux/security.h ---- linux-2.6.38.3/include/linux/security.h 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/include/linux/security.h 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/include/linux/security.h linux-2.6.38.4/includ= e/linux/security.h +--- linux-2.6.38.4/include/linux/security.h 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/include/linux/security.h 2011-04-17 15:57:32.00000000= 0 -0400 @@ -35,6 +35,7 @@ #include #include @@ -49179,9 +47256,9 @@ diff -urNp linux-2.6.38.3/include/linux/security.= h linux-2.6.38.3/include/linux/ #include =20 /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.38.3/include/linux/shm.h linux-2.6.38.3/include/lin= ux/shm.h ---- linux-2.6.38.3/include/linux/shm.h 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/include/linux/shm.h 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/include/linux/shm.h linux-2.6.38.4/include/lin= ux/shm.h +--- linux-2.6.38.4/include/linux/shm.h 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/include/linux/shm.h 2011-04-17 15:57:32.000000000 -04= 00 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -49193,9 +47270,9 @@ diff -urNp linux-2.6.38.3/include/linux/shm.h lin= ux-2.6.38.3/include/linux/shm.h }; =20 /* shm_mode upper byte flags */ -diff -urNp linux-2.6.38.3/include/linux/skbuff.h linux-2.6.38.3/include/= linux/skbuff.h ---- linux-2.6.38.3/include/linux/skbuff.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/skbuff.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/skbuff.h linux-2.6.38.4/include/= linux/skbuff.h +--- linux-2.6.38.4/include/linux/skbuff.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/skbuff.h 2011-04-17 15:57:32.000000000 = -0400 @@ -589,7 +589,7 @@ static inline struct skb_shared_hwtstamp */ static inline int skb_queue_empty(const struct sk_buff_head *list) @@ -49223,9 +47300,9 @@ diff -urNp linux-2.6.38.3/include/linux/skbuff.h = linux-2.6.38.3/include/linux/sk } =20 /** -diff -urNp linux-2.6.38.3/include/linux/slab.h linux-2.6.38.3/include/li= nux/slab.h ---- linux-2.6.38.3/include/linux/slab.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/include/linux/slab.h 2011-04-17 15:57:32.000000000 -0= 400 +diff -urNp linux-2.6.38.4/include/linux/slab.h linux-2.6.38.4/include/li= nux/slab.h +--- linux-2.6.38.4/include/linux/slab.h 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/include/linux/slab.h 2011-04-17 15:57:32.000000000 -0= 400 @@ -11,12 +11,20 @@ =20 #include @@ -49310,9 +47387,9 @@ diff -urNp linux-2.6.38.3/include/linux/slab.h li= nux-2.6.38.3/include/linux/slab +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.38.3/include/linux/slub_def.h linux-2.6.38.3/includ= e/linux/slub_def.h ---- linux-2.6.38.3/include/linux/slub_def.h 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/include/linux/slub_def.h 2011-04-17 15:57:32.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/include/linux/slub_def.h linux-2.6.38.4/includ= e/linux/slub_def.h +--- linux-2.6.38.4/include/linux/slub_def.h 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/include/linux/slub_def.h 2011-04-17 15:57:32.00000000= 0 -0400 @@ -79,7 +79,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -49322,9 +47399,9 @@ diff -urNp linux-2.6.38.3/include/linux/slub_def.= h linux-2.6.38.3/include/linux/ void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.38.3/include/linux/sonet.h linux-2.6.38.3/include/l= inux/sonet.h ---- linux-2.6.38.3/include/linux/sonet.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/sonet.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/sonet.h linux-2.6.38.4/include/l= inux/sonet.h +--- linux-2.6.38.4/include/linux/sonet.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/sonet.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include =20 @@ -49334,9 +47411,9 @@ diff -urNp linux-2.6.38.3/include/linux/sonet.h l= inux-2.6.38.3/include/linux/son __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.38.3/include/linux/sunrpc/clnt.h linux-2.6.38.3/inc= lude/linux/sunrpc/clnt.h ---- linux-2.6.38.3/include/linux/sunrpc/clnt.h 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/include/linux/sunrpc/clnt.h 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/include/linux/sunrpc/clnt.h linux-2.6.38.4/inc= lude/linux/sunrpc/clnt.h +--- linux-2.6.38.4/include/linux/sunrpc/clnt.h 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/include/linux/sunrpc/clnt.h 2011-04-17 15:57:32.00000= 0000 -0400 @@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por { switch (sap->sa_family) { @@ -49367,9 +47444,9 @@ diff -urNp linux-2.6.38.3/include/linux/sunrpc/cl= nt.h linux-2.6.38.3/include/lin } =20 #endif /* __KERNEL__ */ -diff -urNp linux-2.6.38.3/include/linux/suspend.h linux-2.6.38.3/include= /linux/suspend.h ---- linux-2.6.38.3/include/linux/suspend.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/linux/suspend.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/linux/suspend.h linux-2.6.38.4/include= /linux/suspend.h +--- linux-2.6.38.4/include/linux/suspend.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/linux/suspend.h 2011-04-17 15:57:32.000000000= -0400 @@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -49422,9 +47499,9 @@ diff -urNp linux-2.6.38.3/include/linux/suspend.h= linux-2.6.38.3/include/linux/s }; =20 #ifdef CONFIG_HIBERNATION -diff -urNp linux-2.6.38.3/include/linux/sysctl.h linux-2.6.38.3/include/= linux/sysctl.h ---- linux-2.6.38.3/include/linux/sysctl.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/sysctl.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/sysctl.h linux-2.6.38.4/include/= linux/sysctl.h +--- linux-2.6.38.4/include/linux/sysctl.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/sysctl.h 2011-04-17 15:57:32.000000000 = -0400 @@ -155,7 +155,11 @@ enum KERN_PANIC_ON_NMI=3D76, /* int: whether we will panic on an unrecovere= d */ }; @@ -49447,9 +47524,9 @@ diff -urNp linux-2.6.38.3/include/linux/sysctl.h = linux-2.6.38.3/include/linux/sy extern int proc_dointvec(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int proc_dointvec_minmax(struct ctl_table *, int, -diff -urNp linux-2.6.38.3/include/linux/sysfs.h linux-2.6.38.3/include/l= inux/sysfs.h ---- linux-2.6.38.3/include/linux/sysfs.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/sysfs.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/sysfs.h linux-2.6.38.4/include/l= inux/sysfs.h +--- linux-2.6.38.4/include/linux/sysfs.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/sysfs.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -110,8 +110,8 @@ struct bin_attribute { #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr= ) =20 @@ -49461,9 +47538,9 @@ diff -urNp linux-2.6.38.3/include/linux/sysfs.h l= inux-2.6.38.3/include/linux/sys }; =20 struct sysfs_dirent; -diff -urNp linux-2.6.38.3/include/linux/tty.h linux-2.6.38.3/include/lin= ux/tty.h ---- linux-2.6.38.3/include/linux/tty.h 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/include/linux/tty.h 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/include/linux/tty.h linux-2.6.38.4/include/lin= ux/tty.h +--- linux-2.6.38.4/include/linux/tty.h 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/include/linux/tty.h 2011-04-17 15:57:32.000000000 -04= 00 @@ -13,6 +13,8 @@ #include #include @@ -49500,9 +47577,9 @@ diff -urNp linux-2.6.38.3/include/linux/tty.h lin= ux-2.6.38.3/include/linux/tty.h =20 /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.38.3/include/linux/tty_ldisc.h linux-2.6.38.3/inclu= de/linux/tty_ldisc.h ---- linux-2.6.38.3/include/linux/tty_ldisc.h 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/include/linux/tty_ldisc.h 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/include/linux/tty_ldisc.h linux-2.6.38.4/inclu= de/linux/tty_ldisc.h +--- linux-2.6.38.4/include/linux/tty_ldisc.h 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/include/linux/tty_ldisc.h 2011-04-17 15:57:32.0000000= 00 -0400 @@ -148,7 +148,7 @@ struct tty_ldisc_ops { =20 struct module *owner; @@ -49512,9 +47589,9 @@ diff -urNp linux-2.6.38.3/include/linux/tty_ldisc= .h linux-2.6.38.3/include/linux }; =20 struct tty_ldisc { -diff -urNp linux-2.6.38.3/include/linux/types.h linux-2.6.38.3/include/l= inux/types.h ---- linux-2.6.38.3/include/linux/types.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/linux/types.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/linux/types.h linux-2.6.38.4/include/l= inux/types.h +--- linux-2.6.38.4/include/linux/types.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/linux/types.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -207,10 +207,26 @@ typedef struct { int counter; } atomic_t; @@ -49542,9 +47619,9 @@ diff -urNp linux-2.6.38.3/include/linux/types.h l= inux-2.6.38.3/include/linux/typ #endif =20 struct list_head { -diff -urNp linux-2.6.38.3/include/linux/uaccess.h linux-2.6.38.3/include= /linux/uaccess.h ---- linux-2.6.38.3/include/linux/uaccess.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/linux/uaccess.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/linux/uaccess.h linux-2.6.38.4/include= /linux/uaccess.h +--- linux-2.6.38.4/include/linux/uaccess.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/linux/uaccess.h 2011-04-17 15:57:32.000000000= -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs =3D get_fs(); \ @@ -49580,9 +47657,9 @@ diff -urNp linux-2.6.38.3/include/linux/uaccess.h= linux-2.6.38.3/include/linux/u +extern long notrace __probe_kernel_write(void *dst, const void *src, si= ze_t size); =20 #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.38.3/include/linux/unaligned/access_ok.h linux-2.6.= 38.3/include/linux/unaligned/access_ok.h ---- linux-2.6.38.3/include/linux/unaligned/access_ok.h 2011-03-14 21:20:= 32.000000000 -0400 -+++ linux-2.6.38.3/include/linux/unaligned/access_ok.h 2011-04-17 15:57:= 32.000000000 -0400 +diff -urNp linux-2.6.38.4/include/linux/unaligned/access_ok.h linux-2.6.= 38.4/include/linux/unaligned/access_ok.h +--- linux-2.6.38.4/include/linux/unaligned/access_ok.h 2011-03-14 21:20:= 32.000000000 -0400 ++++ linux-2.6.38.4/include/linux/unaligned/access_ok.h 2011-04-17 15:57:= 32.000000000 -0400 @@ -6,32 +6,32 @@ =20 static inline u16 get_unaligned_le16(const void *p) @@ -49622,9 +47699,9 @@ diff -urNp linux-2.6.38.3/include/linux/unaligned= /access_ok.h linux-2.6.38.3/inc } =20 static inline void put_unaligned_le16(u16 val, void *p) -diff -urNp linux-2.6.38.3/include/linux/usb/hcd.h linux-2.6.38.3/include= /linux/usb/hcd.h ---- linux-2.6.38.3/include/linux/usb/hcd.h 2011-04-18 17:27:14.000000000= -0400 -+++ linux-2.6.38.3/include/linux/usb/hcd.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/linux/usb/hcd.h linux-2.6.38.4/include= /linux/usb/hcd.h +--- linux-2.6.38.4/include/linux/usb/hcd.h 2011-04-18 17:27:14.000000000= -0400 ++++ linux-2.6.38.4/include/linux/usb/hcd.h 2011-04-17 15:57:32.000000000= -0400 @@ -589,7 +589,7 @@ struct usb_mon_operations { /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */ }; @@ -49643,9 +47720,9 @@ diff -urNp linux-2.6.38.3/include/linux/usb/hcd.h= linux-2.6.38.3/include/linux/u void usb_mon_deregister(void); =20 #else -diff -urNp linux-2.6.38.3/include/linux/vmalloc.h linux-2.6.38.3/include= /linux/vmalloc.h ---- linux-2.6.38.3/include/linux/vmalloc.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/linux/vmalloc.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/linux/vmalloc.h linux-2.6.38.4/include= /linux/vmalloc.h +--- linux-2.6.38.4/include/linux/vmalloc.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/linux/vmalloc.h 2011-04-17 15:57:32.000000000= -0400 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining=20 #define VM_MAP 0x00000004 /* vmap()ed pages */ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ @@ -49762,9 +47839,9 @@ diff -urNp linux-2.6.38.3/include/linux/vmalloc.h= linux-2.6.38.3/include/linux/v +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.38.3/include/linux/vmstat.h linux-2.6.38.3/include/= linux/vmstat.h ---- linux-2.6.38.3/include/linux/vmstat.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/linux/vmstat.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/linux/vmstat.h linux-2.6.38.4/include/= linux/vmstat.h +--- linux-2.6.38.4/include/linux/vmstat.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/linux/vmstat.h 2011-04-17 15:57:32.000000000 = -0400 @@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in /* * Zone based page accounting with per cpu differentials. @@ -49828,9 +47905,9 @@ diff -urNp linux-2.6.38.3/include/linux/vmstat.h = linux-2.6.38.3/include/linux/vm } =20 static inline void __dec_zone_page_state(struct page *page, -diff -urNp linux-2.6.38.3/include/net/inetpeer.h linux-2.6.38.3/include/= net/inetpeer.h ---- linux-2.6.38.3/include/net/inetpeer.h 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/include/net/inetpeer.h 2011-04-17 15:57:32.000000000 = -0400 +diff -urNp linux-2.6.38.4/include/net/inetpeer.h linux-2.6.38.4/include/= net/inetpeer.h +--- linux-2.6.38.4/include/net/inetpeer.h 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/include/net/inetpeer.h 2011-04-17 15:57:32.000000000 = -0400 @@ -38,8 +38,8 @@ struct inet_peer { */ union { @@ -49851,9 +47928,9 @@ diff -urNp linux-2.6.38.3/include/net/inetpeer.h = linux-2.6.38.3/include/net/inet } =20 #endif /* _NET_INETPEER_H */ -diff -urNp linux-2.6.38.3/include/net/irda/ircomm_tty.h linux-2.6.38.3/i= nclude/net/irda/ircomm_tty.h ---- linux-2.6.38.3/include/net/irda/ircomm_tty.h 2011-03-14 21:20:32.000= 000000 -0400 -+++ linux-2.6.38.3/include/net/irda/ircomm_tty.h 2011-04-17 15:57:32.000= 000000 -0400 +diff -urNp linux-2.6.38.4/include/net/irda/ircomm_tty.h linux-2.6.38.4/i= nclude/net/irda/ircomm_tty.h +--- linux-2.6.38.4/include/net/irda/ircomm_tty.h 2011-03-14 21:20:32.000= 000000 -0400 ++++ linux-2.6.38.4/include/net/irda/ircomm_tty.h 2011-04-17 15:57:32.000= 000000 -0400 @@ -35,6 +35,7 @@ #include #include @@ -49873,9 +47950,9 @@ diff -urNp linux-2.6.38.3/include/net/irda/ircomm= _tty.h linux-2.6.38.3/include/n =20 /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.38.3/include/net/neighbour.h linux-2.6.38.3/include= /net/neighbour.h ---- linux-2.6.38.3/include/net/neighbour.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/net/neighbour.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/net/neighbour.h linux-2.6.38.4/include= /net/neighbour.h +--- linux-2.6.38.4/include/net/neighbour.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/net/neighbour.h 2011-04-17 15:57:32.000000000= -0400 @@ -118,12 +118,12 @@ struct neighbour { =20 struct neigh_ops { @@ -49895,9 +47972,9 @@ diff -urNp linux-2.6.38.3/include/net/neighbour.h= linux-2.6.38.3/include/net/nei }; =20 struct pneigh_entry { -diff -urNp linux-2.6.38.3/include/net/netlink.h linux-2.6.38.3/include/n= et/netlink.h ---- linux-2.6.38.3/include/net/netlink.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/include/net/netlink.h 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/include/net/netlink.h linux-2.6.38.4/include/n= et/netlink.h +--- linux-2.6.38.4/include/net/netlink.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/include/net/netlink.h 2011-04-17 15:57:32.000000000 -= 0400 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct static inline void nlmsg_trim(struct sk_buff *skb, const void *mark) { @@ -49907,9 +47984,9 @@ diff -urNp linux-2.6.38.3/include/net/netlink.h l= inux-2.6.38.3/include/net/netli } =20 /** -diff -urNp linux-2.6.38.3/include/net/sctp/sctp.h linux-2.6.38.3/include= /net/sctp/sctp.h ---- linux-2.6.38.3/include/net/sctp/sctp.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/net/sctp/sctp.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/net/sctp/sctp.h linux-2.6.38.4/include= /net/sctp/sctp.h +--- linux-2.6.38.4/include/net/sctp/sctp.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/net/sctp/sctp.h 2011-04-17 15:57:32.000000000= -0400 @@ -316,9 +316,9 @@ do { \ =20 #else /* SCTP_DEBUG */ @@ -49923,9 +48000,9 @@ diff -urNp linux-2.6.38.3/include/net/sctp/sctp.h= linux-2.6.38.3/include/net/sct #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.38.3/include/net/tcp.h linux-2.6.38.3/include/net/t= cp.h ---- linux-2.6.38.3/include/net/tcp.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/include/net/tcp.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/include/net/tcp.h linux-2.6.38.4/include/net/t= cp.h +--- linux-2.6.38.4/include/net/tcp.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/include/net/tcp.h 2011-04-17 15:57:32.000000000 -0400 @@ -1382,7 +1382,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -49935,9 +48012,9 @@ diff -urNp linux-2.6.38.3/include/net/tcp.h linux= -2.6.38.3/include/net/tcp.h struct seq_operations seq_ops; }; =20 -diff -urNp linux-2.6.38.3/include/net/udp.h linux-2.6.38.3/include/net/u= dp.h ---- linux-2.6.38.3/include/net/udp.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/include/net/udp.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/include/net/udp.h linux-2.6.38.4/include/net/u= dp.h +--- linux-2.6.38.4/include/net/udp.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/include/net/udp.h 2011-04-17 15:57:32.000000000 -0400 @@ -223,7 +223,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -49947,9 +48024,9 @@ diff -urNp linux-2.6.38.3/include/net/udp.h linux= -2.6.38.3/include/net/udp.h struct seq_operations seq_ops; }; =20 -diff -urNp linux-2.6.38.3/include/sound/ac97_codec.h linux-2.6.38.3/incl= ude/sound/ac97_codec.h ---- linux-2.6.38.3/include/sound/ac97_codec.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/include/sound/ac97_codec.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/include/sound/ac97_codec.h linux-2.6.38.4/incl= ude/sound/ac97_codec.h +--- linux-2.6.38.4/include/sound/ac97_codec.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/include/sound/ac97_codec.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -419,15 +419,15 @@ struct snd_ac97; =20 @@ -49973,9 +48050,9 @@ diff -urNp linux-2.6.38.3/include/sound/ac97_code= c.h linux-2.6.38.3/include/soun }; =20 struct snd_ac97_bus_ops { -diff -urNp linux-2.6.38.3/include/trace/events/irq.h linux-2.6.38.3/incl= ude/trace/events/irq.h ---- linux-2.6.38.3/include/trace/events/irq.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/include/trace/events/irq.h 2011-04-17 15:57:32.000000= 000 -0400 +diff -urNp linux-2.6.38.4/include/trace/events/irq.h linux-2.6.38.4/incl= ude/trace/events/irq.h +--- linux-2.6.38.4/include/trace/events/irq.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/include/trace/events/irq.h 2011-04-17 15:57:32.000000= 000 -0400 @@ -36,7 +36,7 @@ struct softirq_action; */ TRACE_EVENT(irq_handler_entry, @@ -49994,9 +48071,9 @@ diff -urNp linux-2.6.38.3/include/trace/events/ir= q.h linux-2.6.38.3/include/trac =20 TP_ARGS(irq, action, ret), =20 -diff -urNp linux-2.6.38.3/include/video/uvesafb.h linux-2.6.38.3/include= /video/uvesafb.h ---- linux-2.6.38.3/include/video/uvesafb.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/include/video/uvesafb.h 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/include/video/uvesafb.h linux-2.6.38.4/include= /video/uvesafb.h +--- linux-2.6.38.4/include/video/uvesafb.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/include/video/uvesafb.h 2011-04-17 15:57:32.000000000= -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -50005,9 +48082,9 @@ diff -urNp linux-2.6.38.3/include/video/uvesafb.h= linux-2.6.38.3/include/video/u void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.38.3/init/do_mounts.c linux-2.6.38.3/init/do_mounts= .c ---- linux-2.6.38.3/init/do_mounts.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/init/do_mounts.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/init/do_mounts.c linux-2.6.38.4/init/do_mounts= .c +--- linux-2.6.38.4/init/do_mounts.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/init/do_mounts.c 2011-04-17 15:57:32.000000000 -0400 @@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa =20 static int __init do_mount_root(char *name, char *fs, int flags, void *= data) @@ -50047,9 +48124,9 @@ diff -urNp linux-2.6.38.3/init/do_mounts.c linux-= 2.6.38.3/init/do_mounts.c + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL= , MS_MOVE, NULL); sys_chroot((const char __user __force *)"."); } -diff -urNp linux-2.6.38.3/init/do_mounts.h linux-2.6.38.3/init/do_mounts= .h ---- linux-2.6.38.3/init/do_mounts.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/init/do_mounts.h 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/init/do_mounts.h linux-2.6.38.4/init/do_mounts= .h +--- linux-2.6.38.4/init/do_mounts.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/init/do_mounts.h 2011-04-17 15:57:32.000000000 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; =20 static inline int create_dev(char *name, dev_t dev) @@ -50069,9 +48146,9 @@ diff -urNp linux-2.6.38.3/init/do_mounts.h linux-= 2.6.38.3/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.38.3/init/do_mounts_initrd.c linux-2.6.38.3/init/do= _mounts_initrd.c ---- linux-2.6.38.3/init/do_mounts_initrd.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/init/do_mounts_initrd.c 2011-04-17 15:57:32.000000000= -0400 +diff -urNp linux-2.6.38.4/init/do_mounts_initrd.c linux-2.6.38.4/init/do= _mounts_initrd.c +--- linux-2.6.38.4/init/do_mounts_initrd.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/init/do_mounts_initrd.c 2011-04-17 15:57:32.000000000= -0400 @@ -44,13 +44,13 @@ static void __init handle_initrd(void) create_dev("/dev/root.old", Root_RAM0); /* mount initrd on rootfs' /root */ @@ -50146,9 +48223,9 @@ diff -urNp linux-2.6.38.3/init/do_mounts_initrd.c= linux-2.6.38.3/init/do_mounts_ + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.38.3/init/do_mounts_md.c linux-2.6.38.3/init/do_mou= nts_md.c ---- linux-2.6.38.3/init/do_mounts_md.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/init/do_mounts_md.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/init/do_mounts_md.c linux-2.6.38.4/init/do_mou= nts_md.c +--- linux-2.6.38.4/init/do_mounts_md.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/init/do_mounts_md.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -50167,9 +48244,9 @@ diff -urNp linux-2.6.38.3/init/do_mounts_md.c lin= ux-2.6.38.3/init/do_mounts_md.c sys_ioctl(fd, BLKRRPART, 0); } sys_close(fd); -diff -urNp linux-2.6.38.3/init/initramfs.c linux-2.6.38.3/init/initramfs= .c ---- linux-2.6.38.3/init/initramfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/init/initramfs.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/init/initramfs.c linux-2.6.38.4/init/initramfs= .c +--- linux-2.6.38.4/init/initramfs.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/init/initramfs.c 2011-04-17 15:57:32.000000000 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -50278,9 +48355,9 @@ diff -urNp linux-2.6.38.3/init/initramfs.c linux-= 2.6.38.3/init/initramfs.c state =3D SkipIt; next_state =3D Reset; return 0; -diff -urNp linux-2.6.38.3/init/Kconfig linux-2.6.38.3/init/Kconfig ---- linux-2.6.38.3/init/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/init/Kconfig 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/init/Kconfig linux-2.6.38.4/init/Kconfig +--- linux-2.6.38.4/init/Kconfig 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/init/Kconfig 2011-04-17 15:57:32.000000000 -0400 @@ -1185,7 +1185,7 @@ config SLUB_DEBUG =20 config COMPAT_BRK @@ -50290,9 +48367,9 @@ diff -urNp linux-2.6.38.3/init/Kconfig linux-2.6.= 38.3/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -diff -urNp linux-2.6.38.3/init/main.c linux-2.6.38.3/init/main.c ---- linux-2.6.38.3/init/main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/init/main.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/init/main.c linux-2.6.38.4/init/main.c +--- linux-2.6.38.4/init/main.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/init/main.c 2011-04-17 15:57:32.000000000 -0400 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void)=20 extern void tc_init(void); #endif @@ -50402,9 +48479,9 @@ diff -urNp linux-2.6.38.3/init/main.c linux-2.6.3= 8.3/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.38.3/ipc/mqueue.c linux-2.6.38.3/ipc/mqueue.c ---- linux-2.6.38.3/ipc/mqueue.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/ipc/mqueue.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/ipc/mqueue.c linux-2.6.38.4/ipc/mqueue.c +--- linux-2.6.38.4/ipc/mqueue.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/ipc/mqueue.c 2011-04-17 15:57:32.000000000 -0400 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st mq_bytes =3D (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -50413,9 +48490,9 @@ diff -urNp linux-2.6.38.3/ipc/mqueue.c linux-2.6.= 38.3/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.38.3/ipc/shm.c linux-2.6.38.3/ipc/shm.c ---- linux-2.6.38.3/ipc/shm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/ipc/shm.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/ipc/shm.c linux-2.6.38.4/ipc/shm.c +--- linux-2.6.38.4/ipc/shm.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/ipc/shm.c 2011-04-17 15:57:32.000000000 -0400 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -50477,9 +48554,9 @@ diff -urNp linux-2.6.38.3/ipc/shm.c linux-2.6.38.= 3/ipc/shm.c size =3D i_size_read(path.dentry->d_inode); shm_unlock(shp); =20 -diff -urNp linux-2.6.38.3/kernel/acct.c linux-2.6.38.3/kernel/acct.c ---- linux-2.6.38.3/kernel/acct.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/acct.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/acct.c linux-2.6.38.4/kernel/acct.c +--- linux-2.6.38.4/kernel/acct.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/acct.c 2011-04-17 15:57:32.000000000 -0400 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a */ flim =3D current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -50489,9 +48566,9 @@ diff -urNp linux-2.6.38.3/kernel/acct.c linux-2.6= .38.3/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur =3D flim; set_fs(fs); -diff -urNp linux-2.6.38.3/kernel/capability.c linux-2.6.38.3/kernel/capa= bility.c ---- linux-2.6.38.3/kernel/capability.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/kernel/capability.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/kernel/capability.c linux-2.6.38.4/kernel/capa= bility.c +--- linux-2.6.38.4/kernel/capability.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/kernel/capability.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_ * before modification is attempted and the application * fails. @@ -50530,9 +48607,9 @@ diff -urNp linux-2.6.38.3/kernel/capability.c lin= ux-2.6.38.3/kernel/capability.c + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.38.3/kernel/compat.c linux-2.6.38.3/kernel/compat.c ---- linux-2.6.38.3/kernel/compat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/compat.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/compat.c linux-2.6.38.4/kernel/compat.c +--- linux-2.6.38.4/kernel/compat.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/compat.c 2011-04-17 15:57:32.000000000 -0400 @@ -13,6 +13,7 @@ =20 #include @@ -50541,9 +48618,9 @@ diff -urNp linux-2.6.38.3/kernel/compat.c linux-2= .6.38.3/kernel/compat.c #include #include #include -diff -urNp linux-2.6.38.3/kernel/configs.c linux-2.6.38.3/kernel/configs= .c ---- linux-2.6.38.3/kernel/configs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/configs.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/configs.c linux-2.6.38.4/kernel/configs= .c +--- linux-2.6.38.4/kernel/configs.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/configs.c 2011-04-17 15:57:32.000000000 -0400 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; =20 @@ -50564,9 +48641,9 @@ diff -urNp linux-2.6.38.3/kernel/configs.c linux-= 2.6.38.3/kernel/configs.c if (!entry) return -ENOMEM; =20 -diff -urNp linux-2.6.38.3/kernel/cred.c linux-2.6.38.3/kernel/cred.c ---- linux-2.6.38.3/kernel/cred.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/cred.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/cred.c linux-2.6.38.4/kernel/cred.c +--- linux-2.6.38.4/kernel/cred.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/cred.c 2011-04-17 15:57:32.000000000 -0400 @@ -483,6 +483,8 @@ int commit_creds(struct cred *new) =20 get_cred(new); /* we will require a ref for the subj creds too */ @@ -50576,9 +48653,9 @@ diff -urNp linux-2.6.38.3/kernel/cred.c linux-2.6= .38.3/kernel/cred.c /* dumpability changes */ if (old->euid !=3D new->euid || old->egid !=3D new->egid || -diff -urNp linux-2.6.38.3/kernel/debug/debug_core.c linux-2.6.38.3/kerne= l/debug/debug_core.c ---- linux-2.6.38.3/kernel/debug/debug_core.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/kernel/debug/debug_core.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/kernel/debug/debug_core.c linux-2.6.38.4/kerne= l/debug/debug_core.c +--- linux-2.6.38.4/kernel/debug/debug_core.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/kernel/debug/debug_core.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -72,7 +72,7 @@ int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -50606,9 +48683,9 @@ diff -urNp linux-2.6.38.3/kernel/debug/debug_core= .c linux-2.6.38.3/kernel/debug/ { BUG_ON(kgdb_connected); =20 -diff -urNp linux-2.6.38.3/kernel/debug/kdb/kdb_main.c linux-2.6.38.3/ker= nel/debug/kdb/kdb_main.c ---- linux-2.6.38.3/kernel/debug/kdb/kdb_main.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/kernel/debug/kdb/kdb_main.c 2011-04-17 15:57:32.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/kernel/debug/kdb/kdb_main.c linux-2.6.38.4/ker= nel/debug/kdb/kdb_main.c +--- linux-2.6.38.4/kernel/debug/kdb/kdb_main.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/kernel/debug/kdb/kdb_main.c 2011-04-17 15:57:32.00000= 0000 -0400 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha list_for_each_entry(mod, kdb_modules, list) { =20 @@ -50627,9 +48704,9 @@ diff -urNp linux-2.6.38.3/kernel/debug/kdb/kdb_ma= in.c linux-2.6.38.3/kernel/debu =20 #ifdef CONFIG_MODULE_UNLOAD { -diff -urNp linux-2.6.38.3/kernel/exit.c linux-2.6.38.3/kernel/exit.c ---- linux-2.6.38.3/kernel/exit.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/exit.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/exit.c linux-2.6.38.4/kernel/exit.c +--- linux-2.6.38.4/kernel/exit.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/exit.c 2011-04-17 15:57:32.000000000 -0400 @@ -57,6 +57,10 @@ #include #include @@ -50749,9 +48826,9 @@ diff -urNp linux-2.6.38.3/kernel/exit.c linux-2.6= .38.3/kernel/exit.c exit_mm(tsk); =20 if (group_dead) -diff -urNp linux-2.6.38.3/kernel/fork.c linux-2.6.38.3/kernel/fork.c ---- linux-2.6.38.3/kernel/fork.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/fork.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/fork.c linux-2.6.38.4/kernel/fork.c +--- linux-2.6.38.4/kernel/fork.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/fork.c 2011-04-17 15:57:32.000000000 -0400 @@ -280,7 +280,7 @@ static struct task_struct *dup_task_stru *stackend =3D STACK_END_MAGIC; /* for overflow detection */ =20 @@ -51048,9 +49125,9 @@ diff -urNp linux-2.6.38.3/kernel/fork.c linux-2.6= .38.3/kernel/fork.c new_fs =3D NULL; else new_fs =3D fs; -diff -urNp linux-2.6.38.3/kernel/futex.c linux-2.6.38.3/kernel/futex.c ---- linux-2.6.38.3/kernel/futex.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/futex.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/futex.c linux-2.6.38.4/kernel/futex.c +--- linux-2.6.38.4/kernel/futex.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/kernel/futex.c 2011-04-22 19:21:35.000000000 -0400 @@ -54,6 +54,7 @@ #include #include @@ -51117,9 +49194,9 @@ diff -urNp linux-2.6.38.3/kernel/futex.c linux-2.= 6.38.3/kernel/futex.c if (curval =3D=3D -EFAULT) futex_cmpxchg_enabled =3D 1; =20 -diff -urNp linux-2.6.38.3/kernel/futex_compat.c linux-2.6.38.3/kernel/fu= tex_compat.c ---- linux-2.6.38.3/kernel/futex_compat.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/kernel/futex_compat.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/kernel/futex_compat.c linux-2.6.38.4/kernel/fu= tex_compat.c +--- linux-2.6.38.4/kernel/futex_compat.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/kernel/futex_compat.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -10,6 +10,7 @@ #include #include @@ -51157,9 +49234,9 @@ diff -urNp linux-2.6.38.3/kernel/futex_compat.c l= inux-2.6.38.3/kernel/futex_comp head =3D p->compat_robust_list; rcu_read_unlock(); } -diff -urNp linux-2.6.38.3/kernel/gcov/base.c linux-2.6.38.3/kernel/gcov/= base.c ---- linux-2.6.38.3/kernel/gcov/base.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/kernel/gcov/base.c 2011-04-17 15:57:32.000000000 -040= 0 +diff -urNp linux-2.6.38.4/kernel/gcov/base.c linux-2.6.38.4/kernel/gcov/= base.c +--- linux-2.6.38.4/kernel/gcov/base.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/kernel/gcov/base.c 2011-04-17 15:57:32.000000000 -040= 0 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } =20 @@ -51181,9 +49258,9 @@ diff -urNp linux-2.6.38.3/kernel/gcov/base.c linu= x-2.6.38.3/kernel/gcov/base.c if (prev) prev->next =3D info->next; else -diff -urNp linux-2.6.38.3/kernel/hrtimer.c linux-2.6.38.3/kernel/hrtimer= .c ---- linux-2.6.38.3/kernel/hrtimer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/hrtimer.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/hrtimer.c linux-2.6.38.4/kernel/hrtimer= .c +--- linux-2.6.38.4/kernel/hrtimer.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/hrtimer.c 2011-04-17 15:57:32.000000000 -0400 @@ -1371,7 +1371,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -51193,9 +49270,9 @@ diff -urNp linux-2.6.38.3/kernel/hrtimer.c linux-= 2.6.38.3/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.38.3/kernel/jump_label.c linux-2.6.38.3/kernel/jump= _label.c ---- linux-2.6.38.3/kernel/jump_label.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/kernel/jump_label.c 2011-04-17 15:57:32.000000000 -04= 00 +diff -urNp linux-2.6.38.4/kernel/jump_label.c linux-2.6.38.4/kernel/jump= _label.c +--- linux-2.6.38.4/kernel/jump_label.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/kernel/jump_label.c 2011-04-17 15:57:32.000000000 -04= 00 @@ -49,6 +49,17 @@ void jump_label_unlock(void) mutex_unlock(&jump_label_mutex); } @@ -51236,9 +49313,9 @@ diff -urNp linux-2.6.38.3/kernel/jump_label.c lin= ux-2.6.38.3/kernel/jump_label.c iter++; } } -diff -urNp linux-2.6.38.3/kernel/kallsyms.c linux-2.6.38.3/kernel/kallsy= ms.c ---- linux-2.6.38.3/kernel/kallsyms.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/kallsyms.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/kallsyms.c linux-2.6.38.4/kernel/kallsy= ms.c +--- linux-2.6.38.4/kernel/kallsyms.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/kallsyms.c 2011-04-17 15:57:32.000000000 -0400 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table = lookup" * compression (see scripts/kallsyms.c for a more complete descrip= tion) @@ -51341,9 +49418,9 @@ diff -urNp linux-2.6.38.3/kernel/kallsyms.c linux= -2.6.38.3/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.38.3/kernel/kmod.c linux-2.6.38.3/kernel/kmod.c ---- linux-2.6.38.3/kernel/kmod.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/kmod.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/kmod.c linux-2.6.38.4/kernel/kmod.c +--- linux-2.6.38.4/kernel/kmod.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/kmod.c 2011-04-17 15:57:32.000000000 -0400 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] =3D "/sb * If module auto-loading support is disabled then this function * becomes a no-operation. @@ -51440,9 +49517,9 @@ diff -urNp linux-2.6.38.3/kernel/kmod.c linux-2.6= .38.3/kernel/kmod.c EXPORT_SYMBOL(__request_module); #endif /* CONFIG_MODULES */ =20 -diff -urNp linux-2.6.38.3/kernel/kprobes.c linux-2.6.38.3/kernel/kprobes= .c ---- linux-2.6.38.3/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/kprobes.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/kprobes.c linux-2.6.38.4/kernel/kprobes= .c +--- linux-2.6.38.4/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/kprobes.c 2011-04-17 15:57:32.000000000 -0400 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. @@ -51479,9 +49556,9 @@ diff -urNp linux-2.6.38.3/kernel/kprobes.c linux-= 2.6.38.3/kernel/kprobes.c =20 head =3D &kprobe_table[i]; preempt_disable(); -diff -urNp linux-2.6.38.3/kernel/lockdep.c linux-2.6.38.3/kernel/lockdep= .c ---- linux-2.6.38.3/kernel/lockdep.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/lockdep.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/lockdep.c linux-2.6.38.4/kernel/lockdep= .c +--- linux-2.6.38.4/kernel/lockdep.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/lockdep.c 2011-04-17 15:57:32.000000000 -0400 @@ -571,6 +571,10 @@ static int static_obj(void *obj) end =3D (unsigned long) &_end, addr =3D (unsigned long) obj; @@ -51510,9 +49587,9 @@ diff -urNp linux-2.6.38.3/kernel/lockdep.c linux-= 2.6.38.3/kernel/lockdep.c if (very_verbose(class)) { printk("\nacquire class [%p] %s", class->key, class->name); if (class->name_version > 1) -diff -urNp linux-2.6.38.3/kernel/lockdep_proc.c linux-2.6.38.3/kernel/lo= ckdep_proc.c ---- linux-2.6.38.3/kernel/lockdep_proc.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/kernel/lockdep_proc.c 2011-04-17 15:57:32.000000000 -= 0400 +diff -urNp linux-2.6.38.4/kernel/lockdep_proc.c linux-2.6.38.4/kernel/lo= ckdep_proc.c +--- linux-2.6.38.4/kernel/lockdep_proc.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/kernel/lockdep_proc.c 2011-04-17 15:57:32.000000000 -= 0400 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v =20 static void print_name(struct seq_file *m, struct lock_class *class) @@ -51522,9 +49599,9 @@ diff -urNp linux-2.6.38.3/kernel/lockdep_proc.c l= inux-2.6.38.3/kernel/lockdep_pr const char *name =3D class->name; =20 if (!name) { -diff -urNp linux-2.6.38.3/kernel/module.c linux-2.6.38.3/kernel/module.c ---- linux-2.6.38.3/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/module.c 2011-04-17 16:05:04.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/module.c linux-2.6.38.4/kernel/module.c +--- linux-2.6.38.4/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/module.c 2011-04-17 16:05:04.000000000 -0400 @@ -57,6 +57,7 @@ #include #include @@ -52247,9 +50324,9 @@ diff -urNp linux-2.6.38.3/kernel/module.c linux-2= .6.38.3/kernel/module.c mod =3D NULL; } return mod; -diff -urNp linux-2.6.38.3/kernel/mutex.c linux-2.6.38.3/kernel/mutex.c ---- linux-2.6.38.3/kernel/mutex.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/mutex.c 2011-04-17 16:24:38.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/mutex.c linux-2.6.38.4/kernel/mutex.c +--- linux-2.6.38.4/kernel/mutex.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/mutex.c 2011-04-17 16:24:38.000000000 -0400 @@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock,=20 */ =20 @@ -52287,9 +50364,9 @@ diff -urNp linux-2.6.38.3/kernel/mutex.c linux-2.= 6.38.3/kernel/mutex.c mutex_set_owner(lock); =20 /* set it to 0 if there are no waiters left: */ -diff -urNp linux-2.6.38.3/kernel/mutex-debug.c linux-2.6.38.3/kernel/mut= ex-debug.c ---- linux-2.6.38.3/kernel/mutex-debug.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/kernel/mutex-debug.c 2011-04-17 16:23:07.000000000 -0= 400 +diff -urNp linux-2.6.38.4/kernel/mutex-debug.c linux-2.6.38.4/kernel/mut= ex-debug.c +--- linux-2.6.38.4/kernel/mutex-debug.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/kernel/mutex-debug.c 2011-04-17 16:23:07.000000000 -0= 400 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute } =20 @@ -52327,9 +50404,9 @@ diff -urNp linux-2.6.38.3/kernel/mutex-debug.c li= nux-2.6.38.3/kernel/mutex-debug DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); mutex_clear_owner(lock); } -diff -urNp linux-2.6.38.3/kernel/mutex-debug.h linux-2.6.38.3/kernel/mut= ex-debug.h ---- linux-2.6.38.3/kernel/mutex-debug.h 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/kernel/mutex-debug.h 2011-04-17 16:26:49.000000000 -0= 400 +diff -urNp linux-2.6.38.4/kernel/mutex-debug.h linux-2.6.38.4/kernel/mut= ex-debug.h +--- linux-2.6.38.4/kernel/mutex-debug.h 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/kernel/mutex-debug.h 2011-04-17 16:26:49.000000000 -0= 400 @@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); extern void debug_mutex_add_waiter(struct mutex *lock, @@ -52350,9 +50427,9 @@ diff -urNp linux-2.6.38.3/kernel/mutex-debug.h li= nux-2.6.38.3/kernel/mutex-debug } =20 static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.38.3/kernel/mutex.h linux-2.6.38.3/kernel/mutex.h ---- linux-2.6.38.3/kernel/mutex.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/mutex.h 2011-04-17 16:24:51.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/mutex.h linux-2.6.38.4/kernel/mutex.h +--- linux-2.6.38.4/kernel/mutex.h 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/mutex.h 2011-04-17 16:24:51.000000000 -0400 @@ -19,7 +19,7 @@ #ifdef CONFIG_SMP static inline void mutex_set_owner(struct mutex *lock) @@ -52362,9 +50439,9 @@ diff -urNp linux-2.6.38.3/kernel/mutex.h linux-2.= 6.38.3/kernel/mutex.h } =20 static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.38.3/kernel/panic.c linux-2.6.38.3/kernel/panic.c ---- linux-2.6.38.3/kernel/panic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/panic.c 2011-04-17 15:57:32.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/panic.c linux-2.6.38.4/kernel/panic.c +--- linux-2.6.38.4/kernel/panic.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/panic.c 2011-04-17 15:57:32.000000000 -0400 @@ -369,7 +369,7 @@ static void warn_slowpath_common(const c const char *board; =20 @@ -52384,9 +50461,9 @@ diff -urNp linux-2.6.38.3/kernel/panic.c linux-2.= 6.38.3/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.38.3/kernel/pid.c linux-2.6.38.3/kernel/pid.c ---- linux-2.6.38.3/kernel/pid.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/pid.c 2011-04-18 19:22:06.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/pid.c linux-2.6.38.4/kernel/pid.c +--- linux-2.6.38.4/kernel/pid.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/kernel/pid.c 2011-04-18 19:22:06.000000000 -0400 @@ -33,6 +33,7 @@ #include #include @@ -52404,23 +50481,7 @@ diff -urNp linux-2.6.38.3/kernel/pid.c linux-2.6= .38.3/kernel/pid.c =20 int pid_max_min =3D RESERVED_PIDS + 1; int pid_max_max =3D PID_MAX_LIMIT; -@@ -217,11 +218,14 @@ static int alloc_pidmap(struct pid_names - return -1; - } -=20 --int next_pidmap(struct pid_namespace *pid_ns, int last) -+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last) - { - int offset; - struct pidmap *map, *end; -=20 -+ if (last >=3D PID_MAX_LIMIT) -+ return -1; -+ - offset =3D (last + 1) & BITS_PER_PAGE_MASK; - map =3D &pid_ns->pidmap[(last + 1)/BITS_PER_PAGE]; - end =3D &pid_ns->pidmap[PIDMAP_ENTRIES]; -@@ -416,8 +420,15 @@ EXPORT_SYMBOL(pid_task); +@@ -419,8 +420,15 @@ EXPORT_SYMBOL(pid_task); */ struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace = *ns) { @@ -52437,9 +50498,9 @@ diff -urNp linux-2.6.38.3/kernel/pid.c linux-2.6.= 38.3/kernel/pid.c } =20 struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.38.3/kernel/posix-cpu-timers.c linux-2.6.38.3/kerne= l/posix-cpu-timers.c ---- linux-2.6.38.3/kernel/posix-cpu-timers.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/kernel/posix-cpu-timers.c 2011-04-17 15:57:32.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/kernel/posix-cpu-timers.c linux-2.6.38.4/kerne= l/posix-cpu-timers.c +--- linux-2.6.38.4/kernel/posix-cpu-timers.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/kernel/posix-cpu-timers.c 2011-04-17 15:57:32.0000000= 00 -0400 @@ -6,6 +6,7 @@ #include #include @@ -52448,9 +50509,9 @@ diff -urNp linux-2.6.38.3/kernel/posix-cpu-timers= .c linux-2.6.38.3/kernel/posix- #include #include #include -diff -urNp linux-2.6.38.3/kernel/posix-timers.c linux-2.6.38.3/kernel/po= six-timers.c ---- linux-2.6.38.3/kernel/posix-timers.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/kernel/posix-timers.c 2011-04-17 15:57:33.000000000 -= 0400 +diff -urNp linux-2.6.38.4/kernel/posix-timers.c linux-2.6.38.4/kernel/po= six-timers.c +--- linux-2.6.38.4/kernel/posix-timers.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/kernel/posix-timers.c 2011-04-17 15:57:33.000000000 -= 0400 @@ -42,6 +42,7 @@ #include #include @@ -52473,9 +50534,9 @@ diff -urNp linux-2.6.38.3/kernel/posix-timers.c l= inux-2.6.38.3/kernel/posix-time return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp)); } =20 -diff -urNp linux-2.6.38.3/kernel/power/poweroff.c linux-2.6.38.3/kernel/= power/poweroff.c ---- linux-2.6.38.3/kernel/power/poweroff.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/kernel/power/poweroff.c 2011-04-17 15:57:33.000000000= -0400 +diff -urNp linux-2.6.38.4/kernel/power/poweroff.c linux-2.6.38.4/kernel/= power/poweroff.c +--- linux-2.6.38.4/kernel/power/poweroff.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/kernel/power/poweroff.c 2011-04-17 15:57:33.000000000= -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask =3D SYSRQ_ENABLE_BOOT, }; @@ -52485,9 +50546,9 @@ diff -urNp linux-2.6.38.3/kernel/power/poweroff.c= linux-2.6.38.3/kernel/power/po { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.38.3/kernel/power/process.c linux-2.6.38.3/kernel/p= ower/process.c ---- linux-2.6.38.3/kernel/power/process.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/kernel/power/process.c 2011-04-17 15:57:33.000000000 = -0400 +diff -urNp linux-2.6.38.4/kernel/power/process.c linux-2.6.38.4/kernel/p= ower/process.c +--- linux-2.6.38.4/kernel/power/process.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/kernel/power/process.c 2011-04-17 15:57:33.000000000 = -0400 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_ u64 elapsed_csecs64; unsigned int elapsed_csecs; @@ -52530,9 +50591,9 @@ diff -urNp linux-2.6.38.3/kernel/power/process.c = linux-2.6.38.3/kernel/power/pro break; =20 if (pm_wakeup_pending()) { -diff -urNp linux-2.6.38.3/kernel/printk.c linux-2.6.38.3/kernel/printk.c ---- linux-2.6.38.3/kernel/printk.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/printk.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/printk.c linux-2.6.38.4/kernel/printk.c +--- linux-2.6.38.4/kernel/printk.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/printk.c 2011-04-17 15:57:33.000000000 -0400 @@ -279,12 +279,17 @@ static int check_syslog_permissions(int=20 if (from_file && type !=3D SYSLOG_ACTION_OPEN) return 0; @@ -52552,9 +50613,9 @@ diff -urNp linux-2.6.38.3/kernel/printk.c linux-2= .6.38.3/kernel/printk.c "but no CAP_SYSLOG (deprecated).\n"); return 0; } -diff -urNp linux-2.6.38.3/kernel/ptrace.c linux-2.6.38.3/kernel/ptrace.c ---- linux-2.6.38.3/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/ptrace.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/ptrace.c linux-2.6.38.4/kernel/ptrace.c +--- linux-2.6.38.4/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/ptrace.c 2011-04-17 15:57:33.000000000 -0400 @@ -116,7 +116,8 @@ int ptrace_check_attach(struct task_stru return ret; } @@ -52696,9 +50757,9 @@ diff -urNp linux-2.6.38.3/kernel/ptrace.c linux-2= .6.38.3/kernel/ptrace.c goto out_put_task_struct; } =20 -diff -urNp linux-2.6.38.3/kernel/rcutree.c linux-2.6.38.3/kernel/rcutree= .c ---- linux-2.6.38.3/kernel/rcutree.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/rcutree.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/rcutree.c linux-2.6.38.4/kernel/rcutree= .c +--- linux-2.6.38.4/kernel/rcutree.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/rcutree.c 2011-04-17 15:57:33.000000000 -0400 @@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state /* * Do softirq processing for the current CPU. @@ -52708,9 +50769,9 @@ diff -urNp linux-2.6.38.3/kernel/rcutree.c linux-= 2.6.38.3/kernel/rcutree.c { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.38.3/kernel/rcutree_plugin.h linux-2.6.38.3/kernel/= rcutree_plugin.h ---- linux-2.6.38.3/kernel/rcutree_plugin.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/kernel/rcutree_plugin.h 2011-04-17 15:57:33.000000000= -0400 +diff -urNp linux-2.6.38.4/kernel/rcutree_plugin.h linux-2.6.38.4/kernel/= rcutree_plugin.h +--- linux-2.6.38.4/kernel/rcutree_plugin.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/kernel/rcutree_plugin.h 2011-04-17 15:57:33.000000000= -0400 @@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void) =20 /* Clean up and exit. */ @@ -52720,9 +50781,9 @@ diff -urNp linux-2.6.38.3/kernel/rcutree_plugin.h= linux-2.6.38.3/kernel/rcutree_ unlock_mb_ret: mutex_unlock(&sync_rcu_preempt_exp_mutex); mb_ret: -diff -urNp linux-2.6.38.3/kernel/resource.c linux-2.6.38.3/kernel/resour= ce.c ---- linux-2.6.38.3/kernel/resource.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/resource.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/resource.c linux-2.6.38.4/kernel/resour= ce.c +--- linux-2.6.38.4/kernel/resource.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/resource.c 2011-04-17 15:57:33.000000000 -0400 @@ -133,8 +133,18 @@ static const struct file_operations proc =20 static int __init ioresources_init(void) @@ -52742,9 +50803,9 @@ diff -urNp linux-2.6.38.3/kernel/resource.c linux= -2.6.38.3/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.38.3/kernel/rtmutex.c linux-2.6.38.3/kernel/rtmutex= .c ---- linux-2.6.38.3/kernel/rtmutex.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/rtmutex.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/rtmutex.c linux-2.6.38.4/kernel/rtmutex= .c +--- linux-2.6.38.4/kernel/rtmutex.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/rtmutex.c 2011-04-17 15:57:33.000000000 -0400 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt */ raw_spin_lock_irqsave(&pendowner->pi_lock, flags); @@ -52754,9 +50815,9 @@ diff -urNp linux-2.6.38.3/kernel/rtmutex.c linux-= 2.6.38.3/kernel/rtmutex.c WARN_ON(pendowner->pi_blocked_on !=3D waiter); WARN_ON(pendowner->pi_blocked_on->lock !=3D lock); =20 -diff -urNp linux-2.6.38.3/kernel/sched.c linux-2.6.38.3/kernel/sched.c ---- linux-2.6.38.3/kernel/sched.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.3/kernel/sched.c 2011-04-17 16:29:21.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/sched.c linux-2.6.38.4/kernel/sched.c +--- linux-2.6.38.4/kernel/sched.c 2011-04-18 17:27:14.000000000 -0400 ++++ linux-2.6.38.4/kernel/sched.c 2011-04-17 16:29:21.000000000 -0400 @@ -4024,7 +4024,7 @@ EXPORT_SYMBOL(schedule); * Look out! "owner" is an entirely speculative pointer * access and not reliable. @@ -52824,10 +50885,10 @@ diff -urNp linux-2.6.38.3/kernel/sched.c linux-= 2.6.38.3/kernel/sched.c =20 if (cpu !=3D group_first_cpu(sd->groups)) return; -diff -urNp linux-2.6.38.3/kernel/sched_fair.c linux-2.6.38.3/kernel/sche= d_fair.c ---- linux-2.6.38.3/kernel/sched_fair.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/kernel/sched_fair.c 2011-04-17 15:57:33.000000000 -04= 00 -@@ -3960,7 +3960,7 @@ static void nohz_idle_balance(int this_c +diff -urNp linux-2.6.38.4/kernel/sched_fair.c linux-2.6.38.4/kernel/sche= d_fair.c +--- linux-2.6.38.4/kernel/sched_fair.c 2011-04-22 19:20:59.000000000 -04= 00 ++++ linux-2.6.38.4/kernel/sched_fair.c 2011-04-22 19:21:39.000000000 -04= 00 +@@ -3957,7 +3957,7 @@ static void nohz_idle_balance(int this_c * run_rebalance_domains is triggered when needed from the scheduler ti= ck. * Also triggered for nohz idle balancing (with nohz_balancing_kick set= ). */ @@ -52836,9 +50897,9 @@ diff -urNp linux-2.6.38.3/kernel/sched_fair.c lin= ux-2.6.38.3/kernel/sched_fair.c { int this_cpu =3D smp_processor_id(); struct rq *this_rq =3D cpu_rq(this_cpu); -diff -urNp linux-2.6.38.3/kernel/signal.c linux-2.6.38.3/kernel/signal.c ---- linux-2.6.38.3/kernel/signal.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.3/kernel/signal.c 2011-04-17 16:53:48.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/signal.c linux-2.6.38.4/kernel/signal.c +--- linux-2.6.38.4/kernel/signal.c 2011-04-18 17:27:18.000000000 -0400 ++++ linux-2.6.38.4/kernel/signal.c 2011-04-17 16:53:48.000000000 -0400 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache =20 int print_fatal_signals __read_mostly; @@ -52941,9 +51002,9 @@ diff -urNp linux-2.6.38.3/kernel/signal.c linux-2= .6.38.3/kernel/signal.c =20 return ret; } -diff -urNp linux-2.6.38.3/kernel/smp.c linux-2.6.38.3/kernel/smp.c ---- linux-2.6.38.3/kernel/smp.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.3/kernel/smp.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/smp.c linux-2.6.38.4/kernel/smp.c +--- linux-2.6.38.4/kernel/smp.c 2011-04-18 17:27:14.000000000 -0400 ++++ linux-2.6.38.4/kernel/smp.c 2011-04-17 15:57:33.000000000 -0400 @@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t fu } EXPORT_SYMBOL(smp_call_function); @@ -52971,9 +51032,9 @@ diff -urNp linux-2.6.38.3/kernel/smp.c linux-2.6.= 38.3/kernel/smp.c { raw_spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.38.3/kernel/softirq.c linux-2.6.38.3/kernel/softirq= .c ---- linux-2.6.38.3/kernel/softirq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/softirq.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/softirq.c linux-2.6.38.4/kernel/softirq= .c +--- linux-2.6.38.4/kernel/softirq.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/softirq.c 2011-04-17 15:57:33.000000000 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec =20 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -53028,9 +51089,9 @@ diff -urNp linux-2.6.38.3/kernel/softirq.c linux-= 2.6.38.3/kernel/softirq.c { struct tasklet_struct *list; =20 -diff -urNp linux-2.6.38.3/kernel/sys.c linux-2.6.38.3/kernel/sys.c ---- linux-2.6.38.3/kernel/sys.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/sys.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/sys.c linux-2.6.38.4/kernel/sys.c +--- linux-2.6.38.4/kernel/sys.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/sys.c 2011-04-17 15:57:33.000000000 -0400 @@ -136,6 +136,12 @@ static int set_one_prio(struct task_stru error =3D -EACCES; goto out; @@ -53152,9 +51213,9 @@ diff -urNp linux-2.6.38.3/kernel/sys.c linux-2.6.= 38.3/kernel/sys.c error =3D -EINVAL; break; } -diff -urNp linux-2.6.38.3/kernel/sysctl.c linux-2.6.38.3/kernel/sysctl.c ---- linux-2.6.38.3/kernel/sysctl.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/kernel/sysctl.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/sysctl.c linux-2.6.38.4/kernel/sysctl.c +--- linux-2.6.38.4/kernel/sysctl.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/kernel/sysctl.c 2011-04-17 15:57:33.000000000 -0400 @@ -84,6 +84,13 @@ =20 =20 @@ -53343,9 +51404,9 @@ diff -urNp linux-2.6.38.3/kernel/sysctl.c linux-2= .6.38.3/kernel/sysctl.c EXPORT_SYMBOL(proc_doulongvec_minmax); EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); EXPORT_SYMBOL(register_sysctl_table); -diff -urNp linux-2.6.38.3/kernel/sysctl_check.c linux-2.6.38.3/kernel/sy= sctl_check.c ---- linux-2.6.38.3/kernel/sysctl_check.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/kernel/sysctl_check.c 2011-04-17 15:57:33.000000000 -= 0400 +diff -urNp linux-2.6.38.4/kernel/sysctl_check.c linux-2.6.38.4/kernel/sy= sctl_check.c +--- linux-2.6.38.4/kernel/sysctl_check.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/kernel/sysctl_check.c 2011-04-17 15:57:33.000000000 -= 0400 @@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n set_fail(&fail, table, "Directory with extra2"); } else { @@ -53354,9 +51415,9 @@ diff -urNp linux-2.6.38.3/kernel/sysctl_check.c l= inux-2.6.38.3/kernel/sysctl_che (table->proc_handler =3D=3D proc_dointvec) || (table->proc_handler =3D=3D proc_dointvec_minmax) || (table->proc_handler =3D=3D proc_dointvec_jiffies) || -diff -urNp linux-2.6.38.3/kernel/taskstats.c linux-2.6.38.3/kernel/tasks= tats.c ---- linux-2.6.38.3/kernel/taskstats.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/kernel/taskstats.c 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/kernel/taskstats.c linux-2.6.38.4/kernel/tasks= tats.c +--- linux-2.6.38.4/kernel/taskstats.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/kernel/taskstats.c 2011-04-17 15:57:33.000000000 -040= 0 @@ -27,9 +27,12 @@ #include #include @@ -53380,9 +51441,9 @@ diff -urNp linux-2.6.38.3/kernel/taskstats.c linu= x-2.6.38.3/kernel/taskstats.c if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK]) return cmd_attr_register_cpumask(info); else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK]) -diff -urNp linux-2.6.38.3/kernel/time/tick-broadcast.c linux-2.6.38.3/ke= rnel/time/tick-broadcast.c ---- linux-2.6.38.3/kernel/time/tick-broadcast.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/kernel/time/tick-broadcast.c 2011-04-17 15:57:33.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/kernel/time/tick-broadcast.c linux-2.6.38.4/ke= rnel/time/tick-broadcast.c +--- linux-2.6.38.4/kernel/time/tick-broadcast.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/kernel/time/tick-broadcast.c 2011-04-17 15:57:33.0000= 00000 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -53392,9 +51453,9 @@ diff -urNp linux-2.6.38.3/kernel/time/tick-broadc= ast.c linux-2.6.38.3/kernel/tim =20 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.38.3/kernel/time/timekeeping.c linux-2.6.38.3/kerne= l/time/timekeeping.c ---- linux-2.6.38.3/kernel/time/timekeeping.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/kernel/time/timekeeping.c 2011-04-17 15:57:33.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/kernel/time/timekeeping.c linux-2.6.38.4/kerne= l/time/timekeeping.c +--- linux-2.6.38.4/kernel/time/timekeeping.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/kernel/time/timekeeping.c 2011-04-17 15:57:33.0000000= 00 -0400 @@ -14,6 +14,7 @@ #include #include @@ -53412,9 +51473,9 @@ diff -urNp linux-2.6.38.3/kernel/time/timekeeping= .c linux-2.6.38.3/kernel/time/t write_seqlock_irqsave(&xtime_lock, flags); =20 timekeeping_forward_now(); -diff -urNp linux-2.6.38.3/kernel/time/timer_list.c linux-2.6.38.3/kernel= /time/timer_list.c ---- linux-2.6.38.3/kernel/time/timer_list.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/kernel/time/timer_list.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/kernel/time/timer_list.c linux-2.6.38.4/kernel= /time/timer_list.c +--- linux-2.6.38.4/kernel/time/timer_list.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/kernel/time/timer_list.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, =20 static void print_name_offset(struct seq_file *m, void *sym) @@ -53456,9 +51517,9 @@ diff -urNp linux-2.6.38.3/kernel/time/timer_list.= c linux-2.6.38.3/kernel/time/ti if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.38.3/kernel/time/timer_stats.c linux-2.6.38.3/kerne= l/time/timer_stats.c ---- linux-2.6.38.3/kernel/time/timer_stats.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/kernel/time/timer_stats.c 2011-04-17 15:57:33.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/kernel/time/timer_stats.c linux-2.6.38.4/kerne= l/time/timer_stats.c +--- linux-2.6.38.4/kernel/time/timer_stats.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/kernel/time/timer_stats.c 2011-04-17 15:57:33.0000000= 00 -0400 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time =20 static void print_name_offset(struct seq_file *m, unsigned long addr) @@ -53488,9 +51549,9 @@ diff -urNp linux-2.6.38.3/kernel/time/timer_stats= .c linux-2.6.38.3/kernel/time/t if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.38.3/kernel/time.c linux-2.6.38.3/kernel/time.c ---- linux-2.6.38.3/kernel/time.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/time.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/time.c linux-2.6.38.4/kernel/time.c +--- linux-2.6.38.4/kernel/time.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/time.c 2011-04-17 15:57:33.000000000 -0400 @@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec=20 return error; =20 @@ -53503,9 +51564,9 @@ diff -urNp linux-2.6.38.3/kernel/time.c linux-2.6= .38.3/kernel/time.c /* SMP safe, global irq locking makes it work. */ sys_tz =3D *tz; update_vsyscall_tz(); -diff -urNp linux-2.6.38.3/kernel/timer.c linux-2.6.38.3/kernel/timer.c ---- linux-2.6.38.3/kernel/timer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/kernel/timer.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/kernel/timer.c linux-2.6.38.4/kernel/timer.c +--- linux-2.6.38.4/kernel/timer.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/kernel/timer.c 2011-04-17 15:57:33.000000000 -0400 @@ -1276,7 +1276,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -53515,9 +51576,9 @@ diff -urNp linux-2.6.38.3/kernel/timer.c linux-2.= 6.38.3/kernel/timer.c { struct tvec_base *base =3D __this_cpu_read(tvec_bases); =20 -diff -urNp linux-2.6.38.3/kernel/trace/ftrace.c linux-2.6.38.3/kernel/tr= ace/ftrace.c ---- linux-2.6.38.3/kernel/trace/ftrace.c 2011-04-18 17:27:14.000000000 -= 0400 -+++ linux-2.6.38.3/kernel/trace/ftrace.c 2011-04-17 15:57:33.000000000 -= 0400 +diff -urNp linux-2.6.38.4/kernel/trace/ftrace.c linux-2.6.38.4/kernel/tr= ace/ftrace.c +--- linux-2.6.38.4/kernel/trace/ftrace.c 2011-04-18 17:27:14.000000000 -= 0400 ++++ linux-2.6.38.4/kernel/trace/ftrace.c 2011-04-17 15:57:33.000000000 -= 0400 @@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod,=20 =20 ip =3D rec->ip; @@ -53539,9 +51600,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/ftrace.c l= inux-2.6.38.3/kernel/trace/ftra } =20 /* -diff -urNp linux-2.6.38.3/kernel/trace/ring_buffer.c linux-2.6.38.3/kern= el/trace/ring_buffer.c ---- linux-2.6.38.3/kernel/trace/ring_buffer.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/kernel/trace/ring_buffer.c 2011-04-17 15:57:33.000000= 000 -0400 +diff -urNp linux-2.6.38.4/kernel/trace/ring_buffer.c linux-2.6.38.4/kern= el/trace/ring_buffer.c +--- linux-2.6.38.4/kernel/trace/ring_buffer.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/kernel/trace/ring_buffer.c 2011-04-17 15:57:33.000000= 000 -0400 @@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st * the reader page). But if the next page is a header page, * its flags will be non zero. @@ -53551,9 +51612,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/ring_buffe= r.c linux-2.6.38.3/kernel/trace rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *page, struct list_head *list) { -diff -urNp linux-2.6.38.3/kernel/trace/trace.c linux-2.6.38.3/kernel/tra= ce/trace.c ---- linux-2.6.38.3/kernel/trace/trace.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/kernel/trace/trace.c 2011-04-17 15:57:33.000000000 -0= 400 +diff -urNp linux-2.6.38.4/kernel/trace/trace.c linux-2.6.38.4/kernel/tra= ce/trace.c +--- linux-2.6.38.4/kernel/trace/trace.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/kernel/trace/trace.c 2011-04-17 15:57:33.000000000 -0= 400 @@ -3967,10 +3967,9 @@ static const struct file_operations trac }; #endif @@ -53578,9 +51639,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace.c li= nux-2.6.38.3/kernel/trace/trace static int once; struct dentry *d_tracer; =20 -diff -urNp linux-2.6.38.3/kernel/trace/trace_events.c linux-2.6.38.3/ker= nel/trace/trace_events.c ---- linux-2.6.38.3/kernel/trace/trace_events.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/kernel/trace/trace_events.c 2011-04-17 15:57:33.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/kernel/trace/trace_events.c linux-2.6.38.4/ker= nel/trace/trace_events.c +--- linux-2.6.38.4/kernel/trace/trace_events.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/kernel/trace/trace_events.c 2011-04-17 15:57:33.00000= 0000 -0400 @@ -1240,10 +1240,10 @@ static LIST_HEAD(ftrace_module_file_list struct ftrace_module_file_ops { struct list_head list; @@ -53596,9 +51657,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace_even= ts.c linux-2.6.38.3/kernel/trac }; =20 static struct ftrace_module_file_ops * -diff -urNp linux-2.6.38.3/kernel/trace/trace_output.c linux-2.6.38.3/ker= nel/trace/trace_output.c ---- linux-2.6.38.3/kernel/trace/trace_output.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/kernel/trace/trace_output.c 2011-04-17 15:57:33.00000= 0000 -0400 +diff -urNp linux-2.6.38.4/kernel/trace/trace_output.c linux-2.6.38.4/ker= nel/trace/trace_output.c +--- linux-2.6.38.4/kernel/trace/trace_output.c 2011-03-14 21:20:32.00000= 0000 -0400 ++++ linux-2.6.38.4/kernel/trace/trace_output.c 2011-04-17 15:57:33.00000= 0000 -0400 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s,=20 =20 p =3D d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -53608,9 +51669,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace_outp= ut.c linux-2.6.38.3/kernel/trac if (p) { s->len =3D p - s->buffer; return 1; -diff -urNp linux-2.6.38.3/kernel/trace/trace_stack.c linux-2.6.38.3/kern= el/trace/trace_stack.c ---- linux-2.6.38.3/kernel/trace/trace_stack.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/kernel/trace/trace_stack.c 2011-04-17 15:57:33.000000= 000 -0400 +diff -urNp linux-2.6.38.4/kernel/trace/trace_stack.c linux-2.6.38.4/kern= el/trace/trace_stack.c +--- linux-2.6.38.4/kernel/trace/trace_stack.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/kernel/trace/trace_stack.c 2011-04-17 15:57:33.000000= 000 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; =20 @@ -53620,9 +51681,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace_stac= k.c linux-2.6.38.3/kernel/trace return; =20 local_irq_save(flags); -diff -urNp linux-2.6.38.3/kernel/trace/trace_workqueue.c linux-2.6.38.3/= kernel/trace/trace_workqueue.c ---- linux-2.6.38.3/kernel/trace/trace_workqueue.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/kernel/trace/trace_workqueue.c 2011-04-17 15:57:33.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/kernel/trace/trace_workqueue.c linux-2.6.38.4/= kernel/trace/trace_workqueue.c +--- linux-2.6.38.4/kernel/trace/trace_workqueue.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/kernel/trace/trace_workqueue.c 2011-04-17 15:57:33.00= 0000000 -0400 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats { int cpu; pid_t pid; @@ -53650,9 +51711,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace_work= queue.c linux-2.6.38.3/kernel/t tsk->comm); put_task_struct(tsk); } -diff -urNp linux-2.6.38.3/lib/bug.c linux-2.6.38.3/lib/bug.c ---- linux-2.6.38.3/lib/bug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/lib/bug.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/lib/bug.c linux-2.6.38.4/lib/bug.c +--- linux-2.6.38.4/lib/bug.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/lib/bug.c 2011-04-17 15:57:33.000000000 -0400 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; =20 @@ -53662,9 +51723,9 @@ diff -urNp linux-2.6.38.3/lib/bug.c linux-2.6.38.= 3/lib/bug.c =20 file =3D NULL; line =3D 0; -diff -urNp linux-2.6.38.3/lib/debugobjects.c linux-2.6.38.3/lib/debugobj= ects.c ---- linux-2.6.38.3/lib/debugobjects.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/lib/debugobjects.c 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/lib/debugobjects.c linux-2.6.38.4/lib/debugobj= ects.c +--- linux-2.6.38.4/lib/debugobjects.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/lib/debugobjects.c 2011-04-17 15:57:33.000000000 -040= 0 @@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -53674,9 +51735,9 @@ diff -urNp linux-2.6.38.3/lib/debugobjects.c linu= x-2.6.38.3/lib/debugobjects.c if (is_on_stack =3D=3D onstack) return; =20 -diff -urNp linux-2.6.38.3/lib/dma-debug.c linux-2.6.38.3/lib/dma-debug.c ---- linux-2.6.38.3/lib/dma-debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/lib/dma-debug.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/lib/dma-debug.c linux-2.6.38.4/lib/dma-debug.c +--- linux-2.6.38.4/lib/dma-debug.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/lib/dma-debug.c 2011-04-17 15:57:33.000000000 -0400 @@ -862,7 +862,7 @@ out: =20 static void check_for_stack(struct device *dev, void *addr) @@ -53686,9 +51747,9 @@ diff -urNp linux-2.6.38.3/lib/dma-debug.c linux-2= .6.38.3/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=3D%p]\n", addr); } -diff -urNp linux-2.6.38.3/lib/inflate.c linux-2.6.38.3/lib/inflate.c ---- linux-2.6.38.3/lib/inflate.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/lib/inflate.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/lib/inflate.c linux-2.6.38.4/lib/inflate.c +--- linux-2.6.38.4/lib/inflate.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/lib/inflate.c 2011-04-17 15:57:33.000000000 -0400 @@ -269,7 +269,7 @@ static void free(void *where) malloc_ptr =3D free_mem_ptr; } @@ -53698,9 +51759,9 @@ diff -urNp linux-2.6.38.3/lib/inflate.c linux-2.6= .38.3/lib/inflate.c #define free(a) kfree(a) #endif =20 -diff -urNp linux-2.6.38.3/lib/Kconfig.debug linux-2.6.38.3/lib/Kconfig.d= ebug ---- linux-2.6.38.3/lib/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/lib/Kconfig.debug 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/lib/Kconfig.debug linux-2.6.38.4/lib/Kconfig.d= ebug +--- linux-2.6.38.4/lib/Kconfig.debug 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/lib/Kconfig.debug 2011-04-22 19:21:39.000000000 -0400 @@ -1066,6 +1066,7 @@ config LATENCYTOP depends on DEBUG_KERNEL depends on STACKTRACE_SUPPORT @@ -53709,9 +51770,9 @@ diff -urNp linux-2.6.38.3/lib/Kconfig.debug linux= -2.6.38.3/lib/Kconfig.debug select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE select KALLSYMS select KALLSYMS_ALL -diff -urNp linux-2.6.38.3/lib/kref.c linux-2.6.38.3/lib/kref.c ---- linux-2.6.38.3/lib/kref.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/lib/kref.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/lib/kref.c linux-2.6.38.4/lib/kref.c +--- linux-2.6.38.4/lib/kref.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/lib/kref.c 2011-04-17 15:57:33.000000000 -0400 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref) */ int kref_put(struct kref *kref, void (*release)(struct kref *kref)) @@ -53721,9 +51782,9 @@ diff -urNp linux-2.6.38.3/lib/kref.c linux-2.6.38= .3/lib/kref.c WARN_ON(release =3D=3D (void (*)(struct kref *))kfree); =20 if (atomic_dec_and_test(&kref->refcount)) { -diff -urNp linux-2.6.38.3/lib/radix-tree.c linux-2.6.38.3/lib/radix-tree= .c ---- linux-2.6.38.3/lib/radix-tree.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/lib/radix-tree.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/lib/radix-tree.c linux-2.6.38.4/lib/radix-tree= .c +--- linux-2.6.38.4/lib/radix-tree.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/lib/radix-tree.c 2011-04-17 15:57:33.000000000 -0400 @@ -80,7 +80,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -53733,9 +51794,9 @@ diff -urNp linux-2.6.38.3/lib/radix-tree.c linux-= 2.6.38.3/lib/radix-tree.c =20 static inline void *ptr_to_indirect(void *ptr) { -diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c ---- linux-2.6.38.3/lib/vsprintf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/lib/vsprintf.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/lib/vsprintf.c linux-2.6.38.4/lib/vsprintf.c +--- linux-2.6.38.4/lib/vsprintf.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/lib/vsprintf.c 2011-04-22 19:21:39.000000000 -0400 @@ -16,6 +16,9 @@ * - scnprintf and vscnprintf */ @@ -53746,7 +51807,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.= 6.38.3/lib/vsprintf.c #include #include #include -@@ -574,7 +577,7 @@ char *symbol_string(char *buf, char *end +@@ -433,7 +436,7 @@ char *symbol_string(char *buf, char *end unsigned long value =3D (unsigned long) ptr; #ifdef CONFIG_KALLSYMS char sym[KSYM_SYMBOL_LEN]; @@ -53755,7 +51816,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.= 6.38.3/lib/vsprintf.c sprint_symbol(sym, value); else kallsyms_lookup(value, NULL, NULL, NULL, sym); -@@ -936,7 +939,11 @@ char *uuid_string(char *buf, char *end,=20 +@@ -795,7 +798,11 @@ char *uuid_string(char *buf, char *end,=20 return string(buf, end, uuid, spec); } =20 @@ -53767,7 +51828,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.= 6.38.3/lib/vsprintf.c =20 /* * Show a '%p' thing. A kernel extension is that the '%p' is followed -@@ -949,6 +956,8 @@ int kptr_restrict =3D 1; +@@ -808,6 +815,8 @@ int kptr_restrict =3D 1; * - 'f' For simple symbolic function names without offset * - 'S' For symbolic direct pointers with offset * - 's' For symbolic direct pointers without offset @@ -53776,7 +51837,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.= 6.38.3/lib/vsprintf.c * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref] * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201] * - 'M' For a 6-byte MAC address, it prints the address in the -@@ -993,12 +1002,12 @@ char *pointer(const char *fmt, char *buf +@@ -852,12 +861,12 @@ char *pointer(const char *fmt, char *buf { if (!ptr) { /* @@ -53791,7 +51852,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.= 6.38.3/lib/vsprintf.c } =20 switch (*fmt) { -@@ -1008,6 +1017,13 @@ char *pointer(const char *fmt, char *buf +@@ -867,6 +876,13 @@ char *pointer(const char *fmt, char *buf /* Fallthrough */ case 'S': case 's': @@ -53805,7 +51866,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.= 6.38.3/lib/vsprintf.c return symbol_string(buf, end, ptr, spec, *fmt); case 'R': case 'r': -@@ -1772,11 +1788,11 @@ int bstr_printf(char *buf, size_t size,=20 +@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size,=20 typeof(type) value; \ if (sizeof(type) =3D=3D 8) { \ args =3D PTR_ALIGN(args, sizeof(u32)); \ @@ -53820,7 +51881,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.= 6.38.3/lib/vsprintf.c } \ args +=3D sizeof(type); \ value; \ -@@ -1839,7 +1855,7 @@ int bstr_printf(char *buf, size_t size,=20 +@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size,=20 case FORMAT_TYPE_STR: { const char *str_arg =3D args; args +=3D strlen(str_arg) + 1; @@ -53829,26 +51890,34 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-= 2.6.38.3/lib/vsprintf.c break; } =20 -diff -urNp linux-2.6.38.3/localversion-grsec linux-2.6.38.3/localversion= -grsec ---- linux-2.6.38.3/localversion-grsec 1969-12-31 19:00:00.000000000 -050= 0 -+++ linux-2.6.38.3/localversion-grsec 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/localversion-grsec linux-2.6.38.4/localversion= -grsec +--- linux-2.6.38.4/localversion-grsec 1969-12-31 19:00:00.000000000 -050= 0 ++++ linux-2.6.38.4/localversion-grsec 2011-04-17 15:57:33.000000000 -040= 0 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.38.3/Makefile linux-2.6.38.3/Makefile ---- linux-2.6.38.3/Makefile 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.3/Makefile 2011-04-17 16:53:16.000000000 -0400 +diff -urNp linux-2.6.38.4/Makefile linux-2.6.38.4/Makefile +--- linux-2.6.38.4/Makefile 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/Makefile 2011-04-23 12:47:27.000000000 -0400 @@ -233,8 +233,8 @@ CONFIG_SHELL :=3D $(shell if [ -x "$$BASH" =20 HOSTCC =3D gcc HOSTCXX =3D g++ -HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fo= mit-frame-pointer -HOSTCXXFLAGS =3D -O2 -+HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 = -fomit-frame-pointer -fno-delete-null-pointer-checks ++HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-mi= ssing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointe= r-checks +HOSTCXXFLAGS =3D -O2 -fno-delete-null-pointer-checks =20 # Decide whether to build built-in, modular, or both. # Normally, just do built-in. -@@ -681,7 +681,7 @@ export mod_strip_cmd +@@ -352,6 +352,7 @@ LINUXINCLUDE :=3D -I$(srctree)/arch/$(h + KBUILD_CPPFLAGS :=3D -D__KERNEL__ +=20 + KBUILD_CFLAGS :=3D -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ ++ -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initia= lizers \ + -fno-strict-aliasing -fno-common \ + -Werror-implicit-function-declaration \ + -Wno-format-security \ +@@ -681,7 +682,7 @@ export mod_strip_cmd =20 =20 ifeq ($(KBUILD_EXTMOD),) @@ -53857,9 +51926,9 @@ diff -urNp linux-2.6.38.3/Makefile linux-2.6.38.3= /Makefile =20 vmlinux-dirs :=3D $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.38.3/mm/bootmem.c linux-2.6.38.3/mm/bootmem.c ---- linux-2.6.38.3/mm/bootmem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/bootmem.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/bootmem.c linux-2.6.38.4/mm/bootmem.c +--- linux-2.6.38.4/mm/bootmem.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/bootmem.c 2011-04-17 15:57:33.000000000 -0400 @@ -201,19 +201,30 @@ static void __init __free_pages_memory(u unsigned long __init free_all_memory_core_early(int nodeid) { @@ -53893,9 +51962,9 @@ diff -urNp linux-2.6.38.3/mm/bootmem.c linux-2.6.= 38.3/mm/bootmem.c =20 return count; } -diff -urNp linux-2.6.38.3/mm/filemap.c linux-2.6.38.3/mm/filemap.c ---- linux-2.6.38.3/mm/filemap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/filemap.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/filemap.c linux-2.6.38.4/mm/filemap.c +--- linux-2.6.38.4/mm/filemap.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/filemap.c 2011-04-17 15:57:33.000000000 -0400 @@ -1664,7 +1664,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping =3D file->f_mapping; =20 @@ -53913,9 +51982,9 @@ diff -urNp linux-2.6.38.3/mm/filemap.c linux-2.6.= 38.3/mm/filemap.c if (*pos >=3D limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.38.3/mm/fremap.c linux-2.6.38.3/mm/fremap.c ---- linux-2.6.38.3/mm/fremap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/fremap.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/fremap.c linux-2.6.38.4/mm/fremap.c +--- linux-2.6.38.4/mm/fremap.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/fremap.c 2011-04-17 15:57:33.000000000 -0400 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma =3D find_vma(mm, start); @@ -53937,9 +52006,9 @@ diff -urNp linux-2.6.38.3/mm/fremap.c linux-2.6.3= 8.3/mm/fremap.c munlock_vma_pages_range(vma, start, start + size); vma->vm_flags =3D saved_flags; } -diff -urNp linux-2.6.38.3/mm/highmem.c linux-2.6.38.3/mm/highmem.c ---- linux-2.6.38.3/mm/highmem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/highmem.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/highmem.c linux-2.6.38.4/mm/highmem.c +--- linux-2.6.38.4/mm/highmem.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/highmem.c 2011-04-17 15:57:33.000000000 -0400 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -53965,9 +52034,9 @@ diff -urNp linux-2.6.38.3/mm/highmem.c linux-2.6.= 38.3/mm/highmem.c pkmap_count[last_pkmap_nr] =3D 1; set_page_address(page, (void *)vaddr); =20 -diff -urNp linux-2.6.38.3/mm/hugetlb.c linux-2.6.38.3/mm/hugetlb.c ---- linux-2.6.38.3/mm/hugetlb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/hugetlb.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/hugetlb.c linux-2.6.38.4/mm/hugetlb.c +--- linux-2.6.38.4/mm/hugetlb.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/hugetlb.c 2011-04-17 15:57:33.000000000 -0400 @@ -2333,6 +2333,27 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -54057,9 +52126,9 @@ diff -urNp linux-2.6.38.3/mm/hugetlb.c linux-2.6.= 38.3/mm/hugetlb.c ptep =3D huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.38.3/mm/Kconfig linux-2.6.38.3/mm/Kconfig ---- linux-2.6.38.3/mm/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/Kconfig 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/Kconfig linux-2.6.38.4/mm/Kconfig +--- linux-2.6.38.4/mm/Kconfig 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/Kconfig 2011-04-17 15:57:33.000000000 -0400 @@ -240,7 +240,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -54069,9 +52138,9 @@ diff -urNp linux-2.6.38.3/mm/Kconfig linux-2.6.38= .3/mm/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.38.3/mm/kmemleak.c linux-2.6.38.3/mm/kmemleak.c ---- linux-2.6.38.3/mm/kmemleak.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/kmemleak.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/kmemleak.c linux-2.6.38.4/mm/kmemleak.c +--- linux-2.6.38.4/mm/kmemleak.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/kmemleak.c 2011-04-17 15:57:33.000000000 -0400 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se =20 for (i =3D 0; i < object->trace_len; i++) { @@ -54081,9 +52150,9 @@ diff -urNp linux-2.6.38.3/mm/kmemleak.c linux-2.6= .38.3/mm/kmemleak.c } } =20 -diff -urNp linux-2.6.38.3/mm/maccess.c linux-2.6.38.3/mm/maccess.c ---- linux-2.6.38.3/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/maccess.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/maccess.c linux-2.6.38.4/mm/maccess.c +--- linux-2.6.38.4/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/maccess.c 2011-04-17 15:57:33.000000000 -0400 @@ -15,10 +15,10 @@ * happens, handle that and return -EFAULT. */ @@ -54110,9 +52179,9 @@ diff -urNp linux-2.6.38.3/mm/maccess.c linux-2.6.= 38.3/mm/maccess.c { long ret; mm_segment_t old_fs =3D get_fs(); -diff -urNp linux-2.6.38.3/mm/madvise.c linux-2.6.38.3/mm/madvise.c ---- linux-2.6.38.3/mm/madvise.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/madvise.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/madvise.c linux-2.6.38.4/mm/madvise.c +--- linux-2.6.38.4/mm/madvise.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/madvise.c 2011-04-17 15:57:33.000000000 -0400 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags =3D vma->vm_flags; @@ -54189,9 +52258,9 @@ diff -urNp linux-2.6.38.3/mm/madvise.c linux-2.6.= 38.3/mm/madvise.c error =3D 0; if (end =3D=3D start) goto out; -diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c ---- linux-2.6.38.3/mm/memory.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/memory.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c +--- linux-2.6.38.4/mm/memory.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/mm/memory.c 2011-04-23 14:01:36.000000000 -0400 @@ -259,8 +259,12 @@ static inline void free_pmd_range(struct return; =20 @@ -54218,7 +52287,21 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.= 38.3/mm/memory.c } =20 /* -@@ -1433,10 +1440,10 @@ int __get_user_pages(struct task_struct=20 +@@ -1410,13 +1417,6 @@ no_page_table: + return page; + } +=20 +-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned= long addr) +-{ +- return (vma->vm_flags & VM_GROWSDOWN) && +- (vma->vm_start =3D=3D addr) && +- !vma_stack_continue(vma->vm_prev, addr); +-} +- + int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, + unsigned long start, int nr_pages, unsigned int gup_flags, + struct page **pages, struct vm_area_struct **vmas, +@@ -1440,10 +1440,10 @@ int __get_user_pages(struct task_struct=20 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); i =3D 0; =20 @@ -54230,9 +52313,9 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c + vma =3D find_vma(mm, start); if (!vma && in_gate_area(tsk, start)) { unsigned long pg =3D start & PAGE_MASK; - struct vm_area_struct *gate_vma =3D get_gate_vma(tsk); -@@ -1489,7 +1496,7 @@ int __get_user_pages(struct task_struct=20 - continue; + pgd_t *pgd; +@@ -1491,7 +1491,7 @@ int __get_user_pages(struct task_struct=20 + goto next_page; } =20 - if (!vma || @@ -54240,7 +52323,21 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.= 38.3/mm/memory.c (vma->vm_flags & (VM_IO | VM_PFNMAP)) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; -@@ -1575,7 +1582,7 @@ int __get_user_pages(struct task_struct=20 +@@ -1502,13 +1502,6 @@ int __get_user_pages(struct task_struct=20 + continue; + } +=20 +- /* +- * If we don't actually want the page itself, +- * and it's the stack guard page, just skip it. +- */ +- if (!pages && stack_guard_page(vma, start)) +- goto next_page; +- + do { + struct page *page; + unsigned int foll_flags =3D gup_flags; +@@ -1585,7 +1578,7 @@ next_page: start +=3D PAGE_SIZE; nr_pages--; } while (nr_pages && start < vma->vm_end); @@ -54249,7 +52346,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c return i; } =20 -@@ -1724,6 +1731,10 @@ static int insert_page(struct vm_area_st +@@ -1734,6 +1727,10 @@ static int insert_page(struct vm_area_st page_add_file_rmap(page); set_pte_at(mm, addr, pte, mk_pte(page, prot)); =20 @@ -54260,7 +52357,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c retval =3D 0; pte_unmap_unlock(pte, ptl); return retval; -@@ -1758,10 +1769,22 @@ out: +@@ -1768,10 +1765,22 @@ out: int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, struct page *page) { @@ -54283,7 +52380,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c vma->vm_flags |=3D VM_INSERTPAGE; return insert_page(vma, addr, page, vma->vm_page_prot); } -@@ -1847,6 +1870,7 @@ int vm_insert_mixed(struct vm_area_struc +@@ -1857,6 +1866,7 @@ int vm_insert_mixed(struct vm_area_struc unsigned long pfn) { BUG_ON(!(vma->vm_flags & VM_MIXEDMAP)); @@ -54291,7 +52388,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c =20 if (addr < vma->vm_start || addr >=3D vma->vm_end) return -EFAULT; -@@ -2162,6 +2186,186 @@ static inline void cow_user_page(struct=20 +@@ -2172,6 +2182,186 @@ static inline void cow_user_page(struct=20 copy_user_highpage(dst, src, va, vma); } =20 @@ -54478,7 +52575,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c /* * This routine handles present pages, when users try to write * to a shared page. It is done by copying the page to a new address -@@ -2373,6 +2577,12 @@ gotten: +@@ -2383,6 +2573,12 @@ gotten: */ page_table =3D pte_offset_map_lock(mm, pmd, address, &ptl); if (likely(pte_same(*page_table, orig_pte))) { @@ -54491,7 +52588,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c if (old_page) { if (!PageAnon(old_page)) { dec_mm_counter_fast(mm, MM_FILEPAGES); -@@ -2424,6 +2634,10 @@ gotten: +@@ -2434,6 +2630,10 @@ gotten: page_remove_rmap(old_page); } =20 @@ -54502,7 +52599,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c /* Free the old page.. */ new_page =3D old_page; ret |=3D VM_FAULT_WRITE; -@@ -2834,6 +3048,11 @@ static int do_swap_page(struct mm_struct +@@ -2844,6 +3044,11 @@ static int do_swap_page(struct mm_struct swap_free(entry); if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)= ) try_to_free_swap(page); @@ -54514,7 +52611,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c unlock_page(page); if (swapcache) { /* -@@ -2857,6 +3076,11 @@ static int do_swap_page(struct mm_struct +@@ -2867,6 +3072,11 @@ static int do_swap_page(struct mm_struct =20 /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, page_table); @@ -54526,7 +52623,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); out: -@@ -2876,40 +3100,6 @@ out_release: +@@ -2886,40 +3096,6 @@ out_release: } =20 /* @@ -54567,7 +52664,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c * We enter with non-exclusive mmap_sem (to exclude vma changes, * but allow concurrent faults), and pte mapped but not yet locked. * We return with mmap_sem still held, but pte unmapped and unlocked. -@@ -2918,27 +3108,23 @@ static int do_anonymous_page(struct mm_s +@@ -2928,27 +3104,23 @@ static int do_anonymous_page(struct mm_s unsigned long address, pte_t *page_table, pmd_t *pmd, unsigned int flags) { @@ -54600,7 +52697,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c if (unlikely(anon_vma_prepare(vma))) goto oom; page =3D alloc_zeroed_user_highpage_movable(vma, address); -@@ -2957,6 +3143,11 @@ static int do_anonymous_page(struct mm_s +@@ -2967,6 +3139,11 @@ static int do_anonymous_page(struct mm_s if (!pte_none(*page_table)) goto release; =20 @@ -54612,7 +52709,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c inc_mm_counter_fast(mm, MM_ANONPAGES); page_add_new_anon_rmap(page, vma, address); setpte: -@@ -2964,6 +3155,12 @@ setpte: +@@ -2974,6 +3151,12 @@ setpte: =20 /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, page_table); @@ -54625,7 +52722,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); return 0; -@@ -3101,6 +3298,12 @@ static int __do_fault(struct mm_struct * +@@ -3111,6 +3294,12 @@ static int __do_fault(struct mm_struct * */ /* Only go through if we didn't race with anybody else... */ if (likely(pte_same(*page_table, orig_pte))) { @@ -54638,7 +52735,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c flush_icache_page(vma, page); entry =3D mk_pte(page, vma->vm_page_prot); if (flags & FAULT_FLAG_WRITE) -@@ -3120,6 +3323,14 @@ static int __do_fault(struct mm_struct * +@@ -3130,6 +3319,14 @@ static int __do_fault(struct mm_struct * =20 /* no need to invalidate: a not-present page won't be cached */ update_mmu_cache(vma, address, page_table); @@ -54653,7 +52750,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c } else { if (charged) mem_cgroup_uncharge_page(page); -@@ -3267,6 +3478,12 @@ int handle_pte_fault(struct mm_struct *m +@@ -3277,6 +3474,12 @@ int handle_pte_fault(struct mm_struct *m if (flags & FAULT_FLAG_WRITE) flush_tlb_fix_spurious_fault(vma, address); } @@ -54666,7 +52763,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -3283,6 +3500,10 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3293,6 +3496,10 @@ int handle_mm_fault(struct mm_struct *mm pmd_t *pmd; pte_t *pte; =20 @@ -54677,7 +52774,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c __set_current_state(TASK_RUNNING); =20 count_vm_event(PGFAULT); -@@ -3293,6 +3514,34 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3303,6 +3510,34 @@ int handle_mm_fault(struct mm_struct *mm if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, flags); =20 @@ -54712,7 +52809,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c pgd =3D pgd_offset(mm, address); pud =3D pud_alloc(mm, pgd, address); if (!pud) -@@ -3426,7 +3675,7 @@ static int __init gate_vma_init(void) +@@ -3436,7 +3671,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start =3D FIXADDR_USER_START; gate_vma.vm_end =3D FIXADDR_USER_END; gate_vma.vm_flags =3D VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; @@ -54721,9 +52818,9 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.3= 8.3/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.38.3/mm/memory-failure.c linux-2.6.38.3/mm/memory-f= ailure.c ---- linux-2.6.38.3/mm/memory-failure.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/mm/memory-failure.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/mm/memory-failure.c linux-2.6.38.4/mm/memory-f= ailure.c +--- linux-2.6.38.4/mm/memory-failure.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/mm/memory-failure.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r =20 int sysctl_memory_failure_recovery __read_mostly =3D 1; @@ -54796,9 +52893,9 @@ diff -urNp linux-2.6.38.3/mm/memory-failure.c lin= ux-2.6.38.3/mm/memory-failure.c SetPageHWPoison(page); /* keep elevated page count for bad page */ return ret; -diff -urNp linux-2.6.38.3/mm/mempolicy.c linux-2.6.38.3/mm/mempolicy.c ---- linux-2.6.38.3/mm/mempolicy.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/mempolicy.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/mempolicy.c linux-2.6.38.4/mm/mempolicy.c +--- linux-2.6.38.4/mm/mempolicy.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/mempolicy.c 2011-04-17 15:57:33.000000000 -0400 @@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct=20 unsigned long vmstart; unsigned long vmend; @@ -54879,9 +52976,9 @@ diff -urNp linux-2.6.38.3/mm/mempolicy.c linux-2.= 6.38.3/mm/mempolicy.c } else if (vma->vm_start <=3D mm->brk && vma->vm_end >=3D mm->start_br= k) { seq_printf(m, " heap"); } else if (vma->vm_start <=3D mm->start_stack && -diff -urNp linux-2.6.38.3/mm/migrate.c linux-2.6.38.3/mm/migrate.c ---- linux-2.6.38.3/mm/migrate.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/migrate.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/migrate.c linux-2.6.38.4/mm/migrate.c +--- linux-2.6.38.4/mm/migrate.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/migrate.c 2011-04-17 15:57:33.000000000 -0400 @@ -1299,6 +1299,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,=20 if (!mm) return -EINVAL; @@ -54907,9 +53004,9 @@ diff -urNp linux-2.6.38.3/mm/migrate.c linux-2.6.= 38.3/mm/migrate.c rcu_read_unlock(); err =3D -EPERM; goto out; -diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c ---- linux-2.6.38.3/mm/mlock.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/mlock.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c +--- linux-2.6.38.4/mm/mlock.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/mm/mlock.c 2011-04-17 15:57:33.000000000 -0400 @@ -13,6 +13,7 @@ #include #include @@ -54918,34 +53015,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.3= 8.3/mm/mlock.c #include #include #include -@@ -135,13 +136,6 @@ void munlock_vma_page(struct page *page) - } - } -=20 --static inline int stack_guard_page(struct vm_area_struct *vma, unsigned= long addr) --{ -- return (vma->vm_flags & VM_GROWSDOWN) && -- (vma->vm_start =3D=3D addr) && -- !vma_stack_continue(vma->vm_prev, addr); --} -- - /** - * __mlock_vma_pages_range() - mlock a range of pages in the vma. - * @vma: target vma -@@ -188,12 +182,6 @@ static long __mlock_vma_pages_range(stru - if (vma->vm_flags & VM_LOCKED) - gup_flags |=3D FOLL_MLOCK; -=20 -- /* We don't try to access the guard page of a stack vma */ -- if (stack_guard_page(vma, start)) { -- addr +=3D PAGE_SIZE; -- nr_pages--; -- } -- - return __get_user_pages(current, mm, addr, nr_pages, gup_flags, - NULL, NULL, nonblocking); - } -@@ -393,6 +381,9 @@ static int do_mlock(unsigned long start, +@@ -380,6 +381,9 @@ static int do_mlock(unsigned long start, return -EINVAL; if (end =3D=3D start) return 0; @@ -54955,7 +53025,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38= .3/mm/mlock.c vma =3D find_vma_prev(current->mm, start, &prev); if (!vma || vma->vm_start > start) return -ENOMEM; -@@ -403,6 +394,11 @@ static int do_mlock(unsigned long start, +@@ -390,6 +394,11 @@ static int do_mlock(unsigned long start, for (nstart =3D start ; ; ) { unsigned int newflags; =20 @@ -54967,7 +53037,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38= .3/mm/mlock.c /* Here we know that vma->vm_start <=3D nstart < vma->vm_end. */ =20 newflags =3D vma->vm_flags | VM_LOCKED; -@@ -508,6 +504,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st +@@ -495,6 +504,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st lock_limit >>=3D PAGE_SHIFT; =20 /* check against resource limits */ @@ -54975,7 +53045,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38= .3/mm/mlock.c if ((locked <=3D lock_limit) || capable(CAP_IPC_LOCK)) error =3D do_mlock(start, len, 1); up_write(¤t->mm->mmap_sem); -@@ -531,17 +528,23 @@ SYSCALL_DEFINE2(munlock, unsigned long,=20 +@@ -518,17 +528,23 @@ SYSCALL_DEFINE2(munlock, unsigned long,=20 static int do_mlockall(int flags) { struct vm_area_struct * vma, * prev =3D NULL; @@ -55003,7 +53073,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38= .3/mm/mlock.c newflags =3D vma->vm_flags | VM_LOCKED; if (!(flags & MCL_CURRENT)) newflags &=3D ~VM_LOCKED; -@@ -573,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) +@@ -560,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) lock_limit >>=3D PAGE_SHIFT; =20 ret =3D -ENOMEM; @@ -55011,9 +53081,9 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38= .3/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <=3D lock_limit) = || capable(CAP_IPC_LOCK)) ret =3D do_mlockall(flags); -diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c ---- linux-2.6.38.3/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/mmap.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/mmap.c linux-2.6.38.4/mm/mmap.c +--- linux-2.6.38.4/mm/mmap.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/mm/mmap.c 2011-04-22 19:25:32.000000000 -0400 @@ -46,6 +46,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -55795,20 +53865,21 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.3= 8.3/mm/mmap.c size =3D vma->vm_end - address; grow =3D (vma->vm_start - address) >> PAGE_SHIFT; =20 -@@ -1818,10 +2100,21 @@ static int expand_downwards(struct vm_ar - if (!error) { - vma->vm_start =3D address; - vma->vm_pgoff -=3D grow; -+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_fla= gs); +@@ -1820,11 +2102,22 @@ static int expand_downwards(struct vm_ar + if (!error) { + vma->vm_start =3D address; + vma->vm_pgoff -=3D grow; ++ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_fl= ags); + +#ifdef CONFIG_PAX_SEGMEXEC -+ if (vma_m) { -+ vma_m->vm_start -=3D grow << PAGE_SHIFT; -+ vma_m->vm_pgoff -=3D grow; -+ } ++ if (vma_m) { ++ vma_m->vm_start -=3D grow << PAGE_SHIFT; ++ vma_m->vm_pgoff -=3D grow; ++ } +#endif + - perf_event_mmap(vma); + perf_event_mmap(vma); + } } } vma_unlock_anon_vma(vma); @@ -55817,7 +53888,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c khugepaged_enter_vma_merge(vma); return error; } -@@ -1896,6 +2189,13 @@ static void remove_vma_list(struct mm_st +@@ -1899,6 +2192,13 @@ static void remove_vma_list(struct mm_st do { long nrpages =3D vma_pages(vma); =20 @@ -55831,7 +53902,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c mm->total_vm -=3D nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); vma =3D remove_vma(vma); -@@ -1941,6 +2241,16 @@ detach_vmas_to_be_unmapped(struct mm_str +@@ -1944,6 +2244,16 @@ detach_vmas_to_be_unmapped(struct mm_str insertion_point =3D (prev ? &prev->vm_next : &mm->mmap); vma->vm_prev =3D NULL; do { @@ -55848,7 +53919,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c rb_erase(&vma->vm_rb, &mm->mm_rb); mm->map_count--; tail_vma =3D vma; -@@ -1969,14 +2279,33 @@ static int __split_vma(struct mm_struct=20 +@@ -1972,14 +2282,33 @@ static int __split_vma(struct mm_struct=20 struct vm_area_struct *new; int err =3D -ENOMEM; =20 @@ -55882,7 +53953,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c /* most fields are the same, copy all, and then fixup */ *new =3D *vma; =20 -@@ -1989,6 +2318,22 @@ static int __split_vma(struct mm_struct=20 +@@ -1992,6 +2321,22 @@ static int __split_vma(struct mm_struct=20 new->vm_pgoff +=3D ((addr - vma->vm_start) >> PAGE_SHIFT); } =20 @@ -55905,7 +53976,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c pol =3D mpol_dup(vma_policy(vma)); if (IS_ERR(pol)) { err =3D PTR_ERR(pol); -@@ -2014,6 +2359,42 @@ static int __split_vma(struct mm_struct=20 +@@ -2017,6 +2362,42 @@ static int __split_vma(struct mm_struct=20 else err =3D vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); =20 @@ -55948,7 +54019,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c /* Success. */ if (!err) return 0; -@@ -2026,10 +2407,18 @@ static int __split_vma(struct mm_struct=20 +@@ -2029,10 +2410,18 @@ static int __split_vma(struct mm_struct=20 removed_exe_file_vma(mm); fput(new->vm_file); } @@ -55968,7 +54039,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c kmem_cache_free(vm_area_cachep, new); out_err: return err; -@@ -2042,6 +2431,15 @@ static int __split_vma(struct mm_struct=20 +@@ -2045,6 +2434,15 @@ static int __split_vma(struct mm_struct=20 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, int new_below) { @@ -55984,13 +54055,13 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.3= 8.3/mm/mmap.c if (mm->map_count >=3D sysctl_max_map_count) return -ENOMEM; =20 -@@ -2053,11 +2451,30 @@ int split_vma(struct mm_struct *mm, stru +@@ -2056,11 +2454,30 @@ int split_vma(struct mm_struct *mm, stru * work. This now handles partial unmappings. * Jeremy Fitzhardinge */ +#ifdef CONFIG_PAX_SEGMEXEC - int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) - { ++int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) ++{ + int ret =3D __do_munmap(mm, start, len); + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC)) + return ret; @@ -56000,9 +54071,9 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c + +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +#else -+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) + int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +#endif -+{ + { unsigned long end; struct vm_area_struct *vma, *prev, *last; =20 @@ -56015,7 +54086,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start= ) return -EINVAL; =20 -@@ -2131,6 +2548,8 @@ int do_munmap(struct mm_struct *mm, unsi +@@ -2134,6 +2551,8 @@ int do_munmap(struct mm_struct *mm, unsi /* Fix up all other VM information */ remove_vma_list(mm, vma); =20 @@ -56024,7 +54095,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c return 0; } =20 -@@ -2143,22 +2562,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a +@@ -2146,22 +2565,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a =20 profile_munmap(addr); =20 @@ -56053,7 +54124,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -2172,6 +2587,7 @@ unsigned long do_brk(unsigned long addr, +@@ -2175,6 +2590,7 @@ unsigned long do_brk(unsigned long addr, struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff =3D addr >> PAGE_SHIFT; int error; @@ -56061,7 +54132,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c =20 len =3D PAGE_ALIGN(len); if (!len) -@@ -2183,16 +2599,30 @@ unsigned long do_brk(unsigned long addr, +@@ -2186,16 +2602,30 @@ unsigned long do_brk(unsigned long addr, =20 flags =3D VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; =20 @@ -56093,7 +54164,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c locked +=3D mm->locked_vm; lock_limit =3D rlimit(RLIMIT_MEMLOCK); lock_limit >>=3D PAGE_SHIFT; -@@ -2209,22 +2639,22 @@ unsigned long do_brk(unsigned long addr, +@@ -2212,22 +2642,22 @@ unsigned long do_brk(unsigned long addr, /* * Clear old maps. this also does some error checking for us */ @@ -56120,7 +54191,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c return -ENOMEM; =20 /* Can we just expand an old private anonymous mapping? */ -@@ -2238,7 +2668,7 @@ unsigned long do_brk(unsigned long addr, +@@ -2241,7 +2671,7 @@ unsigned long do_brk(unsigned long addr, */ vma =3D kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -56129,7 +54200,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c return -ENOMEM; } =20 -@@ -2252,11 +2682,12 @@ unsigned long do_brk(unsigned long addr, +@@ -2255,11 +2685,12 @@ unsigned long do_brk(unsigned long addr, vma_link(mm, vma, prev, rb_link, rb_parent); out: perf_event_mmap(vma); @@ -56144,7 +54215,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c return addr; } =20 -@@ -2303,8 +2734,10 @@ void exit_mmap(struct mm_struct *mm) +@@ -2306,8 +2737,10 @@ void exit_mmap(struct mm_struct *mm) * Walk the list again, actually closing and freeing it, * with preemption enabled, without holding any MM locks. */ @@ -56156,7 +54227,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c =20 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); } -@@ -2318,6 +2751,13 @@ int insert_vm_struct(struct mm_struct *=20 +@@ -2321,6 +2754,13 @@ int insert_vm_struct(struct mm_struct *=20 struct vm_area_struct * __vma, * prev; struct rb_node ** rb_link, * rb_parent; =20 @@ -56170,7 +54241,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c /* * The vm_pgoff of a purely anonymous vma should be irrelevant * until its first write fault, when page's anon_vma and index -@@ -2340,7 +2780,22 @@ int insert_vm_struct(struct mm_struct *=20 +@@ -2343,7 +2783,22 @@ int insert_vm_struct(struct mm_struct *=20 if ((vma->vm_flags & VM_ACCOUNT) && security_vm_enough_memory_mm(mm, vma_pages(vma))) return -ENOMEM; @@ -56193,7 +54264,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c return 0; } =20 -@@ -2358,6 +2813,8 @@ struct vm_area_struct *copy_vma(struct v +@@ -2361,6 +2816,8 @@ struct vm_area_struct *copy_vma(struct v struct rb_node **rb_link, *rb_parent; struct mempolicy *pol; =20 @@ -56202,7 +54273,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2407,6 +2864,39 @@ struct vm_area_struct *copy_vma(struct v +@@ -2410,6 +2867,39 @@ struct vm_area_struct *copy_vma(struct v kmem_cache_free(vm_area_cachep, new_vma); return NULL; } @@ -56242,7 +54313,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c =20 /* * Return true if the calling process may expand its vm space by the pa= ssed -@@ -2418,7 +2908,7 @@ int may_expand_vm(struct mm_struct *mm,=20 +@@ -2421,7 +2911,7 @@ int may_expand_vm(struct mm_struct *mm,=20 unsigned long lim; =20 lim =3D rlimit(RLIMIT_AS) >> PAGE_SHIFT; @@ -56251,7 +54322,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c if (cur + npages > lim) return 0; return 1; -@@ -2489,6 +2979,22 @@ int install_special_mapping(struct mm_st +@@ -2492,6 +2982,22 @@ int install_special_mapping(struct mm_st vma->vm_start =3D addr; vma->vm_end =3D addr + len; =20 @@ -56274,9 +54345,9 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.= 3/mm/mmap.c vma->vm_flags =3D vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); =20 -diff -urNp linux-2.6.38.3/mm/mprotect.c linux-2.6.38.3/mm/mprotect.c ---- linux-2.6.38.3/mm/mprotect.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/mprotect.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/mprotect.c linux-2.6.38.4/mm/mprotect.c +--- linux-2.6.38.4/mm/mprotect.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/mprotect.c 2011-04-17 15:57:33.000000000 -0400 @@ -23,10 +23,16 @@ #include #include @@ -56503,9 +54574,9 @@ diff -urNp linux-2.6.38.3/mm/mprotect.c linux-2.6= .38.3/mm/mprotect.c nstart =3D tmp; =20 if (nstart < prev->vm_end) -diff -urNp linux-2.6.38.3/mm/mremap.c linux-2.6.38.3/mm/mremap.c ---- linux-2.6.38.3/mm/mremap.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.3/mm/mremap.c 2011-04-17 16:53:48.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/mremap.c linux-2.6.38.4/mm/mremap.c +--- linux-2.6.38.4/mm/mremap.c 2011-04-18 17:27:18.000000000 -0400 ++++ linux-2.6.38.4/mm/mremap.c 2011-04-17 16:53:48.000000000 -0400 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; pte =3D ptep_clear_flush(vma, old_addr, old_pte); @@ -56610,9 +54681,9 @@ diff -urNp linux-2.6.38.3/mm/mremap.c linux-2.6.3= 8.3/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.38.3/mm/nommu.c linux-2.6.38.3/mm/nommu.c ---- linux-2.6.38.3/mm/nommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/nommu.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/nommu.c linux-2.6.38.4/mm/nommu.c +--- linux-2.6.38.4/mm/nommu.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/nommu.c 2011-04-17 15:57:33.000000000 -0400 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory =3D OVERCOMMI int sysctl_overcommit_ratio =3D 50; /* default is 50% */ int sysctl_max_map_count =3D DEFAULT_MAX_MAP_COUNT; @@ -56645,9 +54716,9 @@ diff -urNp linux-2.6.38.3/mm/nommu.c linux-2.6.38= .3/mm/nommu.c *region =3D *vma->vm_region; new->vm_region =3D region; =20 -diff -urNp linux-2.6.38.3/mm/page_alloc.c linux-2.6.38.3/mm/page_alloc.c ---- linux-2.6.38.3/mm/page_alloc.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/mm/page_alloc.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/page_alloc.c linux-2.6.38.4/mm/page_alloc.c +--- linux-2.6.38.4/mm/page_alloc.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/mm/page_alloc.c 2011-04-17 15:57:33.000000000 -0400 @@ -644,6 +644,10 @@ static bool free_pages_prepare(struct pa int i; int bad =3D 0; @@ -56683,9 +54754,9 @@ diff -urNp linux-2.6.38.3/mm/page_alloc.c linux-2= .6.38.3/mm/page_alloc.c =20 if (order && (gfp_flags & __GFP_COMP)) prep_compound_page(page, order); -diff -urNp linux-2.6.38.3/mm/percpu.c linux-2.6.38.3/mm/percpu.c ---- linux-2.6.38.3/mm/percpu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/percpu.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/percpu.c linux-2.6.38.4/mm/percpu.c +--- linux-2.6.38.4/mm/percpu.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/percpu.c 2011-04-17 15:57:33.000000000 -0400 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu=20 static unsigned int pcpu_last_unit_cpu __read_mostly; =20 @@ -56695,9 +54766,9 @@ diff -urNp linux-2.6.38.3/mm/percpu.c linux-2.6.3= 8.3/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); =20 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.38.3/mm/rmap.c linux-2.6.38.3/mm/rmap.c ---- linux-2.6.38.3/mm/rmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/rmap.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/rmap.c linux-2.6.38.4/mm/rmap.c +--- linux-2.6.38.4/mm/rmap.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/rmap.c 2011-04-17 15:57:33.000000000 -0400 @@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru struct anon_vma *anon_vma =3D vma->anon_vma; struct anon_vma_chain *avc; @@ -56787,9 +54858,9 @@ diff -urNp linux-2.6.38.3/mm/rmap.c linux-2.6.38.= 3/mm/rmap.c { struct anon_vma_chain *avc; struct anon_vma *anon_vma; -diff -urNp linux-2.6.38.3/mm/shmem.c linux-2.6.38.3/mm/shmem.c ---- linux-2.6.38.3/mm/shmem.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/mm/shmem.c 2011-04-18 22:03:12.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/shmem.c linux-2.6.38.4/mm/shmem.c +--- linux-2.6.38.4/mm/shmem.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/mm/shmem.c 2011-04-18 22:03:12.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -56817,9 +54888,9 @@ diff -urNp linux-2.6.38.3/mm/shmem.c linux-2.6.38= .3/mm/shmem.c /* do it inline */ memcpy(info, symname, len); inode->i_op =3D &shmem_symlink_inline_operations; -diff -urNp linux-2.6.38.3/mm/slab.c linux-2.6.38.3/mm/slab.c ---- linux-2.6.38.3/mm/slab.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/mm/slab.c 2011-04-18 22:03:34.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/slab.c linux-2.6.38.4/mm/slab.c +--- linux-2.6.38.4/mm/slab.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/mm/slab.c 2011-04-23 12:47:28.000000000 -0400 @@ -150,7 +150,7 @@ =20 /* Legal flag mask for kmem_cache_create(). */ @@ -56856,24 +54927,15 @@ diff -urNp linux-2.6.38.3/mm/slab.c linux-2.6.3= 8.3/mm/slab.c { u32 offset =3D (obj - slab->s_mem); return reciprocal_divide(offset, cache->reciprocal_buffer_size); -@@ -560,14 +560,14 @@ struct cache_names { +@@ -560,7 +560,7 @@ struct cache_names { static struct cache_names __initdata cache_names[] =3D { #define CACHE(x) { .name =3D "size-" #x, .name_dma =3D "size-" #x "(DMA= )" }, #include - {NULL,} -+ {NULL, NULL} ++ {NULL} #undef CACHE }; =20 - static struct arraycache_init initarray_cache __initdata =3D -- { {0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; -+ { {0, BOOT_CPUCACHE_ENTRIES, 1, 0}, {NULL} }; - static struct arraycache_init initarray_generic =3D -- { {0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; -+ { {0, BOOT_CPUCACHE_ENTRIES, 1, 0}, {NULL} }; -=20 - /* internal cache of cache description objs */ - static struct kmem_cache cache_cache =3D { @@ -1526,7 +1526,7 @@ void __init kmem_cache_init(void) sizes[INDEX_AC].cs_cachep =3D kmem_cache_create(names[INDEX_AC].name, sizes[INDEX_AC].cs_size, @@ -56970,9 +55032,9 @@ diff -urNp linux-2.6.38.3/mm/slab.c linux-2.6.38.= 3/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.38.3/mm/slob.c linux-2.6.38.3/mm/slob.c ---- linux-2.6.38.3/mm/slob.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/slob.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/slob.c linux-2.6.38.4/mm/slob.c +--- linux-2.6.38.4/mm/slob.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/slob.c 2011-04-17 15:57:33.000000000 -0400 @@ -29,7 +29,7 @@ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls * alloc_pages() directly, allocating compound pages so the page order @@ -57289,9 +55351,9 @@ diff -urNp linux-2.6.38.3/mm/slob.c linux-2.6.38.= 3/mm/slob.c } =20 trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.38.3/mm/slub.c linux-2.6.38.3/mm/slub.c ---- linux-2.6.38.3/mm/slub.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/slub.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/slub.c linux-2.6.38.4/mm/slub.c +--- linux-2.6.38.4/mm/slub.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/slub.c 2011-04-17 15:57:33.000000000 -0400 @@ -390,7 +390,7 @@ static void print_track(const char *s, s if (!t->addr) return; @@ -57466,9 +55528,9 @@ diff -urNp linux-2.6.38.3/mm/slub.c linux-2.6.38.= 3/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.38.3/mm/util.c linux-2.6.38.3/mm/util.c ---- linux-2.6.38.3/mm/util.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/util.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/util.c linux-2.6.38.4/mm/util.c +--- linux-2.6.38.4/mm/util.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/util.c 2011-04-17 15:57:33.000000000 -0400 @@ -219,6 +219,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -57482,9 +55544,9 @@ diff -urNp linux-2.6.38.3/mm/util.c linux-2.6.38.= 3/mm/util.c mm->get_unmapped_area =3D arch_get_unmapped_area; mm->unmap_area =3D arch_unmap_area; } -diff -urNp linux-2.6.38.3/mm/vmalloc.c linux-2.6.38.3/mm/vmalloc.c ---- linux-2.6.38.3/mm/vmalloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/vmalloc.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/vmalloc.c linux-2.6.38.4/mm/vmalloc.c +--- linux-2.6.38.4/mm/vmalloc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/vmalloc.c 2011-04-17 15:57:33.000000000 -0400 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, =20 pte =3D pte_offset_kernel(pmd, addr); @@ -57717,9 +55779,9 @@ diff -urNp linux-2.6.38.3/mm/vmalloc.c linux-2.6.= 38.3/mm/vmalloc.c if ((PAGE_SIZE-1) & (unsigned long)addr) return -EINVAL; =20 -diff -urNp linux-2.6.38.3/mm/vmstat.c linux-2.6.38.3/mm/vmstat.c ---- linux-2.6.38.3/mm/vmstat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/mm/vmstat.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/mm/vmstat.c linux-2.6.38.4/mm/vmstat.c +--- linux-2.6.38.4/mm/vmstat.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/mm/vmstat.c 2011-04-17 15:57:33.000000000 -0400 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -57772,9 +55834,9 @@ diff -urNp linux-2.6.38.3/mm/vmstat.c linux-2.6.3= 8.3/mm/vmstat.c #endif return 0; } -diff -urNp linux-2.6.38.3/net/8021q/vlan.c linux-2.6.38.3/net/8021q/vlan= .c ---- linux-2.6.38.3/net/8021q/vlan.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/8021q/vlan.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/8021q/vlan.c linux-2.6.38.4/net/8021q/vlan= .c +--- linux-2.6.38.4/net/8021q/vlan.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/8021q/vlan.c 2011-04-17 15:57:33.000000000 -0400 @@ -589,8 +589,7 @@ static int vlan_ioctl_handler(struct net err =3D -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -57785,9 +55847,9 @@ diff -urNp linux-2.6.38.3/net/8021q/vlan.c linux-= 2.6.38.3/net/8021q/vlan.c struct vlan_net *vn; =20 vn =3D net_generic(net, vlan_net_id); -diff -urNp linux-2.6.38.3/net/atm/atm_misc.c linux-2.6.38.3/net/atm/atm_= misc.c ---- linux-2.6.38.3/net/atm/atm_misc.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/net/atm/atm_misc.c 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/net/atm/atm_misc.c linux-2.6.38.4/net/atm/atm_= misc.c +--- linux-2.6.38.4/net/atm/atm_misc.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/net/atm/atm_misc.c 2011-04-17 15:57:33.000000000 -040= 0 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int=20 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <=3D sk_atm(vcc)->sk_rcvb= uf) return 1; @@ -57824,9 +55886,9 @@ diff -urNp linux-2.6.38.3/net/atm/atm_misc.c linu= x-2.6.38.3/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.38.3/net/atm/proc.c linux-2.6.38.3/net/atm/proc.c ---- linux-2.6.38.3/net/atm/proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/atm/proc.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/atm/proc.c linux-2.6.38.4/net/atm/proc.c +--- linux-2.6.38.4/net/atm/proc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/atm/proc.c 2011-04-17 15:57:33.000000000 -0400 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -57865,9 +55927,9 @@ diff -urNp linux-2.6.38.3/net/atm/proc.c linux-2.= 6.38.3/net/atm/proc.c else seq_printf(seq, "%3d %3d %5d ", vcc->dev->number, vcc->vpi, vcc->vci); -diff -urNp linux-2.6.38.3/net/atm/resources.c linux-2.6.38.3/net/atm/res= ources.c ---- linux-2.6.38.3/net/atm/resources.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/net/atm/resources.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/net/atm/resources.c linux-2.6.38.4/net/atm/res= ources.c +--- linux-2.6.38.4/net/atm/resources.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/net/atm/resources.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister); static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -57886,9 +55948,9 @@ diff -urNp linux-2.6.38.3/net/atm/resources.c lin= ux-2.6.38.3/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.38.3/net/bridge/br_multicast.c linux-2.6.38.3/net/b= ridge/br_multicast.c ---- linux-2.6.38.3/net/bridge/br_multicast.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/net/bridge/br_multicast.c 2011-04-17 15:57:33.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/net/bridge/br_multicast.c linux-2.6.38.4/net/b= ridge/br_multicast.c +--- linux-2.6.38.4/net/bridge/br_multicast.c 2011-04-22 19:20:59.0000000= 00 -0400 ++++ linux-2.6.38.4/net/bridge/br_multicast.c 2011-04-22 19:21:47.0000000= 00 -0400 @@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct=20 nexthdr =3D ip6h->nexthdr; offset =3D ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr); @@ -57898,9 +55960,9 @@ diff -urNp linux-2.6.38.3/net/bridge/br_multicast= .c linux-2.6.38.3/net/bridge/br return 0; =20 /* Okay, we found ICMPv6 header */ -diff -urNp linux-2.6.38.3/net/bridge/netfilter/ebtables.c linux-2.6.38.3= /net/bridge/netfilter/ebtables.c ---- linux-2.6.38.3/net/bridge/netfilter/ebtables.c 2011-04-18 17:27:18.0= 00000000 -0400 -+++ linux-2.6.38.3/net/bridge/netfilter/ebtables.c 2011-04-17 17:00:29.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/net/bridge/netfilter/ebtables.c linux-2.6.38.4= /net/bridge/netfilter/ebtables.c +--- linux-2.6.38.4/net/bridge/netfilter/ebtables.c 2011-04-18 17:27:18.0= 00000000 -0400 ++++ linux-2.6.38.4/net/bridge/netfilter/ebtables.c 2011-04-17 17:00:29.0= 00000000 -0400 @@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s tmp.valid_hooks =3D t->table->valid_hooks; } @@ -57910,9 +55972,9 @@ diff -urNp linux-2.6.38.3/net/bridge/netfilter/eb= tables.c linux-2.6.38.3/net/bri BUGPRINT("c2u Didn't work\n"); ret =3D -EFAULT; break; -diff -urNp linux-2.6.38.3/net/can/bcm.c linux-2.6.38.3/net/can/bcm.c ---- linux-2.6.38.3/net/can/bcm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/can/bcm.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/can/bcm.c linux-2.6.38.4/net/can/bcm.c +--- linux-2.6.38.4/net/can/bcm.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/can/bcm.c 2011-04-17 15:57:33.000000000 -0400 @@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file struct bcm_sock *bo =3D bcm_sk(sk); struct bcm_op *op; @@ -57929,9 +55991,26 @@ diff -urNp linux-2.6.38.3/net/can/bcm.c linux-2.= 6.38.3/net/can/bcm.c seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs); seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex)); seq_printf(m, " <<<\n"); -diff -urNp linux-2.6.38.3/net/core/dev.c linux-2.6.38.3/net/core/dev.c ---- linux-2.6.38.3/net/core/dev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/core/dev.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/can/raw.c linux-2.6.38.4/net/can/raw.c +--- linux-2.6.38.4/net/can/raw.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/can/raw.c 2011-04-22 19:39:11.000000000 -0400 +@@ -305,7 +305,12 @@ static int raw_init(struct sock *sk) + static int raw_release(struct socket *sock) + { + struct sock *sk =3D sock->sk; +- struct raw_sock *ro =3D raw_sk(sk); ++ struct raw_sock *ro; ++ ++ if (!sk) ++ return 0; ++ ++ ro =3D raw_sk(sk); +=20 + unregister_netdevice_notifier(&ro->notifier); +=20 +diff -urNp linux-2.6.38.4/net/core/dev.c linux-2.6.38.4/net/core/dev.c +--- linux-2.6.38.4/net/core/dev.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/core/dev.c 2011-04-17 15:57:33.000000000 -0400 @@ -1124,10 +1124,14 @@ void dev_load(struct net *net, const cha if (no_module && capable(CAP_NET_ADMIN)) no_module =3D request_module("netdev-%s", name); @@ -57965,9 +56044,9 @@ diff -urNp linux-2.6.38.3/net/core/dev.c linux-2.= 6.38.3/net/core/dev.c { struct softnet_data *sd =3D &__get_cpu_var(softnet_data); unsigned long time_limit =3D jiffies + 2; -diff -urNp linux-2.6.38.3/net/core/sock.c linux-2.6.38.3/net/core/sock.c ---- linux-2.6.38.3/net/core/sock.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/core/sock.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/core/sock.c linux-2.6.38.4/net/core/sock.c +--- linux-2.6.38.4/net/core/sock.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/core/sock.c 2011-04-17 15:57:33.000000000 -0400 @@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock, return -ENOTCONN; if (lv < len) @@ -57986,37 +56065,9 @@ diff -urNp linux-2.6.38.3/net/core/sock.c linux-= 2.6.38.3/net/core/sock.c return -EFAULT; lenout: if (put_user(len, optlen)) -diff -urNp linux-2.6.38.3/net/dccp/ccids/ccid3.c linux-2.6.38.3/net/dccp= /ccids/ccid3.c ---- linux-2.6.38.3/net/dccp/ccids/ccid3.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/net/dccp/ccids/ccid3.c 2011-04-17 15:57:33.000000000 = -0400 -@@ -41,7 +41,7 @@ - static int ccid3_debug; - #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format,= ##a) - #else --#define ccid3_pr_debug(format, a...) -+#define ccid3_pr_debug(format, a...) do {} while (0) - #endif -=20 - /* -diff -urNp linux-2.6.38.3/net/dccp/dccp.h linux-2.6.38.3/net/dccp/dccp.h ---- linux-2.6.38.3/net/dccp/dccp.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/dccp/dccp.h 2011-04-17 15:57:33.000000000 -0400 -@@ -44,9 +44,9 @@ extern int dccp_debug; - #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, forma= t, ##a) - #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) - #else --#define dccp_pr_debug(format, a...) --#define dccp_pr_debug_cat(format, a...) --#define dccp_debug(format, a...) -+#define dccp_pr_debug(format, a...) do {} while (0) -+#define dccp_pr_debug_cat(format, a...) do {} while (0) -+#define dccp_debug(format, a...) do {} while (0) - #endif -=20 - extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.38.3/net/decnet/sysctl_net_decnet.c linux-2.6.38.3/= net/decnet/sysctl_net_decnet.c ---- linux-2.6.38.3/net/decnet/sysctl_net_decnet.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/net/decnet/sysctl_net_decnet.c 2011-04-17 15:57:33.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/net/decnet/sysctl_net_decnet.c linux-2.6.38.4/= net/decnet/sysctl_net_decnet.c +--- linux-2.6.38.4/net/decnet/sysctl_net_decnet.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/net/decnet/sysctl_net_decnet.c 2011-04-17 15:57:33.00= 0000000 -0400 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t =20 if (len > *lenp) len =3D *lenp; @@ -58035,9 +56086,9 @@ diff -urNp linux-2.6.38.3/net/decnet/sysctl_net_d= ecnet.c linux-2.6.38.3/net/decn return -EFAULT; =20 *lenp =3D len; -diff -urNp linux-2.6.38.3/net/econet/Kconfig linux-2.6.38.3/net/econet/K= config ---- linux-2.6.38.3/net/econet/Kconfig 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/net/econet/Kconfig 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/net/econet/Kconfig linux-2.6.38.4/net/econet/K= config +--- linux-2.6.38.4/net/econet/Kconfig 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/net/econet/Kconfig 2011-04-17 15:57:33.000000000 -040= 0 @@ -4,7 +4,7 @@ =20 config ECONET @@ -58047,9 +56098,9 @@ diff -urNp linux-2.6.38.3/net/econet/Kconfig linu= x-2.6.38.3/net/econet/Kconfig ---help--- Econet is a fairly old and slow networking protocol mainly used by Acorn computers to access file and print servers. It uses native -diff -urNp linux-2.6.38.3/net/ipv4/inet_diag.c linux-2.6.38.3/net/ipv4/i= net_diag.c ---- linux-2.6.38.3/net/ipv4/inet_diag.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/net/ipv4/inet_diag.c 2011-04-17 15:57:33.000000000 -0= 400 +diff -urNp linux-2.6.38.4/net/ipv4/inet_diag.c linux-2.6.38.4/net/ipv4/i= net_diag.c +--- linux-2.6.38.4/net/ipv4/inet_diag.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/net/ipv4/inet_diag.c 2011-04-17 15:57:33.000000000 -0= 400 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc r->idiag_retrans =3D 0; =20 @@ -58111,9 +56162,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/inet_diag.c li= nux-2.6.38.3/net/ipv4/inet_diag =20 tmo =3D req->expires - jiffies; if (tmo < 0) -diff -urNp linux-2.6.38.3/net/ipv4/inet_hashtables.c linux-2.6.38.3/net/= ipv4/inet_hashtables.c ---- linux-2.6.38.3/net/ipv4/inet_hashtables.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/net/ipv4/inet_hashtables.c 2011-04-17 15:57:33.000000= 000 -0400 +diff -urNp linux-2.6.38.4/net/ipv4/inet_hashtables.c linux-2.6.38.4/net/= ipv4/inet_hashtables.c +--- linux-2.6.38.4/net/ipv4/inet_hashtables.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/net/ipv4/inet_hashtables.c 2011-04-17 15:57:33.000000= 000 -0400 @@ -18,11 +18,14 @@ #include #include @@ -58138,9 +56189,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/inet_hashtable= s.c linux-2.6.38.3/net/ipv4/ine if (tw) { inet_twsk_deschedule(tw, death_row); while (twrefcnt) { -diff -urNp linux-2.6.38.3/net/ipv4/inetpeer.c linux-2.6.38.3/net/ipv4/in= etpeer.c ---- linux-2.6.38.3/net/ipv4/inetpeer.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/net/ipv4/inetpeer.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/net/ipv4/inetpeer.c linux-2.6.38.4/net/ipv4/in= etpeer.c +--- linux-2.6.38.4/net/ipv4/inetpeer.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/net/ipv4/inetpeer.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -509,8 +509,8 @@ struct inet_peer *inet_getpeer(struct in if (p) { p->daddr =3D *daddr; @@ -58152,9 +56203,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/inetpeer.c lin= ux-2.6.38.3/net/ipv4/inetpeer.c p->tcp_ts_stamp =3D 0; INIT_LIST_HEAD(&p->unused); =20 -diff -urNp linux-2.6.38.3/net/ipv4/ip_fragment.c linux-2.6.38.3/net/ipv4= /ip_fragment.c ---- linux-2.6.38.3/net/ipv4/ip_fragment.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/net/ipv4/ip_fragment.c 2011-04-17 15:57:33.000000000 = -0400 +diff -urNp linux-2.6.38.4/net/ipv4/ip_fragment.c linux-2.6.38.4/net/ipv4= /ip_fragment.c +--- linux-2.6.38.4/net/ipv4/ip_fragment.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/net/ipv4/ip_fragment.c 2011-04-17 15:57:33.000000000 = -0400 @@ -298,7 +298,7 @@ static inline int ip_frag_too_far(struct return 0; =20 @@ -58164,9 +56215,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/ip_fragment.c = linux-2.6.38.3/net/ipv4/ip_frag qp->rid =3D end; =20 rc =3D qp->q.fragments && (end - start) > max; -diff -urNp linux-2.6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2= .6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-14 21:= 20:32.000000000 -0400 -+++ linux-2.6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15:= 57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2= .6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-14 21:= 20:32.000000000 -0400 ++++ linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15:= 57:33.000000000 -0400 @@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode( =20 *len =3D 0; @@ -58176,9 +56227,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/netfilter/nf_n= at_snmp_basic.c linux-2.6.38.3/ if (*octets =3D=3D NULL) { if (net_ratelimit()) pr_notice("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.38.3/net/ipv4/raw.c linux-2.6.38.3/net/ipv4/raw.c ---- linux-2.6.38.3/net/ipv4/raw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/ipv4/raw.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/ipv4/raw.c linux-2.6.38.4/net/ipv4/raw.c +--- linux-2.6.38.4/net/ipv4/raw.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/ipv4/raw.c 2011-04-17 15:57:33.000000000 -0400 @@ -724,15 +724,19 @@ static int raw_init(struct sock *sk) =20 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int = optlen) @@ -58211,9 +56262,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/raw.c linux-2.= 6.38.3/net/ipv4/raw.c goto out; ret =3D 0; out: return ret; -diff -urNp linux-2.6.38.3/net/ipv4/route.c linux-2.6.38.3/net/ipv4/route= .c ---- linux-2.6.38.3/net/ipv4/route.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/ipv4/route.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/ipv4/route.c linux-2.6.38.4/net/ipv4/route= .c +--- linux-2.6.38.4/net/ipv4/route.c 2011-04-22 19:20:59.000000000 -0400 ++++ linux-2.6.38.4/net/ipv4/route.c 2011-04-22 19:21:47.000000000 -0400 @@ -2857,7 +2857,7 @@ static int rt_fill_info(struct net *net, expires =3D rt->dst.expires ? rt->dst.expires - jiffies : 0; if (rt->peer) { @@ -58223,9 +56274,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/route.c linux-= 2.6.38.3/net/ipv4/route.c if (rt->peer->tcp_ts_stamp) { ts =3D rt->peer->tcp_ts; tsage =3D get_seconds() - rt->peer->tcp_ts_stamp; -diff -urNp linux-2.6.38.3/net/ipv4/tcp_ipv4.c linux-2.6.38.3/net/ipv4/tc= p_ipv4.c ---- linux-2.6.38.3/net/ipv4/tcp_ipv4.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/net/ipv4/tcp_ipv4.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/net/ipv4/tcp_ipv4.c linux-2.6.38.4/net/ipv4/tc= p_ipv4.c +--- linux-2.6.38.4/net/ipv4/tcp_ipv4.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/net/ipv4/tcp_ipv4.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; EXPORT_SYMBOL(sysctl_tcp_low_latency); @@ -58321,9 +56372,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/tcp_ipv4.c lin= ux-2.6.38.3/net/ipv4/tcp_ipv4.c } =20 #define TMPSZ 150 -diff -urNp linux-2.6.38.3/net/ipv4/tcp_minisocks.c linux-2.6.38.3/net/ip= v4/tcp_minisocks.c ---- linux-2.6.38.3/net/ipv4/tcp_minisocks.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/net/ipv4/tcp_minisocks.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/net/ipv4/tcp_minisocks.c linux-2.6.38.4/net/ip= v4/tcp_minisocks.c +--- linux-2.6.38.4/net/ipv4/tcp_minisocks.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/net/ipv4/tcp_minisocks.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -27,6 +27,10 @@ #include #include @@ -58346,9 +56397,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/tcp_minisocks.= c linux-2.6.38.3/net/ipv4/tcp_m if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); =20 -diff -urNp linux-2.6.38.3/net/ipv4/tcp_probe.c linux-2.6.38.3/net/ipv4/t= cp_probe.c ---- linux-2.6.38.3/net/ipv4/tcp_probe.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/net/ipv4/tcp_probe.c 2011-04-17 15:57:33.000000000 -0= 400 +diff -urNp linux-2.6.38.4/net/ipv4/tcp_probe.c linux-2.6.38.4/net/ipv4/t= cp_probe.c +--- linux-2.6.38.4/net/ipv4/tcp_probe.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/net/ipv4/tcp_probe.c 2011-04-17 15:57:33.000000000 -0= 400 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >=3D len) break; @@ -58358,9 +56409,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/tcp_probe.c li= nux-2.6.38.3/net/ipv4/tcp_probe return -EFAULT; cnt +=3D width; } -diff -urNp linux-2.6.38.3/net/ipv4/tcp_timer.c linux-2.6.38.3/net/ipv4/t= cp_timer.c ---- linux-2.6.38.3/net/ipv4/tcp_timer.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/net/ipv4/tcp_timer.c 2011-04-17 15:57:33.000000000 -0= 400 +diff -urNp linux-2.6.38.4/net/ipv4/tcp_timer.c linux-2.6.38.4/net/ipv4/t= cp_timer.c +--- linux-2.6.38.4/net/ipv4/tcp_timer.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/net/ipv4/tcp_timer.c 2011-04-17 15:57:33.000000000 -0= 400 @@ -22,6 +22,10 @@ #include #include @@ -58386,9 +56437,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/tcp_timer.c li= nux-2.6.38.3/net/ipv4/tcp_timer if (retransmits_timed_out(sk, retry_until, syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) { /* Has it gone just too far? */ -diff -urNp linux-2.6.38.3/net/ipv4/udp.c linux-2.6.38.3/net/ipv4/udp.c ---- linux-2.6.38.3/net/ipv4/udp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/ipv4/udp.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/ipv4/udp.c linux-2.6.38.4/net/ipv4/udp.c +--- linux-2.6.38.4/net/ipv4/udp.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/ipv4/udp.c 2011-04-17 15:57:33.000000000 -0400 @@ -86,6 +86,7 @@ #include #include @@ -58472,21 +56523,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/udp.c linux-2= .6.38.3/net/ipv4/udp.c atomic_read(&sp->sk_drops), len); } =20 -diff -urNp linux-2.6.38.3/net/ipv6/exthdrs.c linux-2.6.38.3/net/ipv6/ext= hdrs.c ---- linux-2.6.38.3/net/ipv6/exthdrs.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/net/ipv6/exthdrs.c 2011-04-17 15:57:33.000000000 -040= 0 -@@ -634,7 +634,7 @@ static struct tlvtype_proc tlvprochopopt - .type =3D IPV6_TLV_JUMBO, - .func =3D ipv6_hop_jumbo, - }, -- { -1, } -+ { -1, NULL } - }; -=20 - int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.38.3/net/ipv6/raw.c linux-2.6.38.3/net/ipv6/raw.c ---- linux-2.6.38.3/net/ipv6/raw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/ipv6/raw.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/ipv6/raw.c linux-2.6.38.4/net/ipv6/raw.c +--- linux-2.6.38.4/net/ipv6/raw.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/ipv6/raw.c 2011-04-17 15:57:33.000000000 -0400 @@ -602,7 +602,7 @@ out: return err; } @@ -58546,9 +56585,9 @@ diff -urNp linux-2.6.38.3/net/ipv6/raw.c linux-2.= 6.38.3/net/ipv6/raw.c } =20 static int raw6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.38.3/net/ipv6/tcp_ipv6.c linux-2.6.38.3/net/ipv6/tc= p_ipv6.c ---- linux-2.6.38.3/net/ipv6/tcp_ipv6.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/net/ipv6/tcp_ipv6.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/net/ipv6/tcp_ipv6.c linux-2.6.38.4/net/ipv6/tc= p_ipv6.c +--- linux-2.6.38.4/net/ipv6/tcp_ipv6.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/net/ipv6/tcp_ipv6.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #endif @@ -58648,9 +56687,9 @@ diff -urNp linux-2.6.38.3/net/ipv6/tcp_ipv6.c lin= ux-2.6.38.3/net/ipv6/tcp_ipv6.c } =20 static int tcp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.38.3/net/ipv6/udp.c linux-2.6.38.3/net/ipv6/udp.c ---- linux-2.6.38.3/net/ipv6/udp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/ipv6/udp.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/ipv6/udp.c linux-2.6.38.4/net/ipv6/udp.c +--- linux-2.6.38.4/net/ipv6/udp.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/ipv6/udp.c 2011-04-17 15:57:33.000000000 -0400 @@ -50,6 +50,10 @@ #include #include "udp_impl.h" @@ -58686,9 +56725,9 @@ diff -urNp linux-2.6.38.3/net/ipv6/udp.c linux-2.= 6.38.3/net/ipv6/udp.c atomic_read(&sp->sk_drops)); } =20 -diff -urNp linux-2.6.38.3/net/irda/ircomm/ircomm_tty.c linux-2.6.38.3/ne= t/irda/ircomm/ircomm_tty.c ---- linux-2.6.38.3/net/irda/ircomm/ircomm_tty.c 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:57:33.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c linux-2.6.38.4/ne= t/irda/ircomm/ircomm_tty.c +--- linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:57:33.0000= 00000 -0400 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); =20 @@ -58811,9 +56850,9 @@ diff -urNp linux-2.6.38.3/net/irda/ircomm/ircomm_= tty.c linux-2.6.38.3/net/irda/i seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); =20 -diff -urNp linux-2.6.38.3/net/key/af_key.c linux-2.6.38.3/net/key/af_key= .c ---- linux-2.6.38.3/net/key/af_key.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/key/af_key.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/key/af_key.c linux-2.6.38.4/net/key/af_key= .c +--- linux-2.6.38.4/net/key/af_key.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/key/af_key.c 2011-04-17 15:57:33.000000000 -0400 @@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_fil seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); else @@ -58826,9 +56865,9 @@ diff -urNp linux-2.6.38.3/net/key/af_key.c linux-= 2.6.38.3/net/key/af_key.c atomic_read(&s->sk_refcnt), sk_rmem_alloc_get(s), sk_wmem_alloc_get(s), -diff -urNp linux-2.6.38.3/net/mac80211/cfg.c linux-2.6.38.3/net/mac80211= /cfg.c ---- linux-2.6.38.3/net/mac80211/cfg.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/net/mac80211/cfg.c 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/net/mac80211/cfg.c linux-2.6.38.4/net/mac80211= /cfg.c +--- linux-2.6.38.4/net/mac80211/cfg.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/net/mac80211/cfg.c 2011-04-17 15:57:33.000000000 -040= 0 @@ -1939,7 +1939,7 @@ static int ieee80211_get_antenna(struct=20 return drv_get_antenna(local, tx_ant, rx_ant); } @@ -58838,9 +56877,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/cfg.c linu= x-2.6.38.3/net/mac80211/cfg.c .add_virtual_intf =3D ieee80211_add_iface, .del_virtual_intf =3D ieee80211_del_iface, .change_virtual_intf =3D ieee80211_change_iface, -diff -urNp linux-2.6.38.3/net/mac80211/cfg.h linux-2.6.38.3/net/mac80211= /cfg.h ---- linux-2.6.38.3/net/mac80211/cfg.h 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/net/mac80211/cfg.h 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/net/mac80211/cfg.h linux-2.6.38.4/net/mac80211= /cfg.h +--- linux-2.6.38.4/net/mac80211/cfg.h 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/net/mac80211/cfg.h 2011-04-17 15:57:33.000000000 -040= 0 @@ -4,6 +4,6 @@ #ifndef __CFG_H #define __CFG_H @@ -58849,9 +56888,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/cfg.h linu= x-2.6.38.3/net/mac80211/cfg.h +extern const struct cfg80211_ops mac80211_config_ops; =20 #endif /* __CFG_H */ -diff -urNp linux-2.6.38.3/net/mac80211/ieee80211_i.h linux-2.6.38.3/net/= mac80211/ieee80211_i.h ---- linux-2.6.38.3/net/mac80211/ieee80211_i.h 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/net/mac80211/ieee80211_i.h 2011-04-17 15:57:33.000000= 000 -0400 +diff -urNp linux-2.6.38.4/net/mac80211/ieee80211_i.h linux-2.6.38.4/net/= mac80211/ieee80211_i.h +--- linux-2.6.38.4/net/mac80211/ieee80211_i.h 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/net/mac80211/ieee80211_i.h 2011-04-17 15:57:33.000000= 000 -0400 @@ -27,6 +27,7 @@ #include #include @@ -58869,9 +56908,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/ieee80211_= i.h linux-2.6.38.3/net/mac80211 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll, -diff -urNp linux-2.6.38.3/net/mac80211/iface.c linux-2.6.38.3/net/mac802= 11/iface.c ---- linux-2.6.38.3/net/mac80211/iface.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/net/mac80211/iface.c 2011-04-17 15:57:33.000000000 -0= 400 +diff -urNp linux-2.6.38.4/net/mac80211/iface.c linux-2.6.38.4/net/mac802= 11/iface.c +--- linux-2.6.38.4/net/mac80211/iface.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/net/mac80211/iface.c 2011-04-17 15:57:33.000000000 -0= 400 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_ break; } @@ -58926,9 +56965,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/iface.c li= nux-2.6.38.3/net/mac80211/iface if (local->ops->napi_poll) napi_disable(&local->napi); ieee80211_clear_tx_pending(local); -diff -urNp linux-2.6.38.3/net/mac80211/main.c linux-2.6.38.3/net/mac8021= 1/main.c ---- linux-2.6.38.3/net/mac80211/main.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/net/mac80211/main.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/net/mac80211/main.c linux-2.6.38.4/net/mac8021= 1/main.c +--- linux-2.6.38.4/net/mac80211/main.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/net/mac80211/main.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -161,7 +161,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level =3D power; } @@ -58938,9 +56977,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/main.c lin= ux-2.6.38.3/net/mac80211/main.c ret =3D drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.38.3/net/mac80211/pm.c linux-2.6.38.3/net/mac80211/= pm.c ---- linux-2.6.38.3/net/mac80211/pm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/mac80211/pm.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/mac80211/pm.c linux-2.6.38.4/net/mac80211/= pm.c +--- linux-2.6.38.4/net/mac80211/pm.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/mac80211/pm.c 2011-04-17 15:57:33.000000000 -0400 @@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211 } =20 @@ -58950,9 +56989,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/pm.c linux= -2.6.38.3/net/mac80211/pm.c ieee80211_stop_device(local); =20 local->suspended =3D true; -diff -urNp linux-2.6.38.3/net/mac80211/rate.c linux-2.6.38.3/net/mac8021= 1/rate.c ---- linux-2.6.38.3/net/mac80211/rate.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/net/mac80211/rate.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/net/mac80211/rate.c linux-2.6.38.4/net/mac8021= 1/rate.c +--- linux-2.6.38.4/net/mac80211/rate.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/net/mac80211/rate.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct=20 =20 ASSERT_RTNL(); @@ -58962,9 +57001,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/rate.c lin= ux-2.6.38.3/net/mac80211/rate.c return -EBUSY; =20 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) { -diff -urNp linux-2.6.38.3/net/mac80211/rc80211_pid_debugfs.c linux-2.6.3= 8.3/net/mac80211/rc80211_pid_debugfs.c ---- linux-2.6.38.3/net/mac80211/rc80211_pid_debugfs.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/net/mac80211/rc80211_pid_debugfs.c 2011-04-17 15:57:3= 3.000000000 -0400 +diff -urNp linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.3= 8.4/net/mac80211/rc80211_pid_debugfs.c +--- linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c 2011-04-17 15:57:3= 3.000000000 -0400 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r =20 spin_unlock_irqrestore(&events->lock, status); @@ -58974,9 +57013,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/rc80211_pi= d_debugfs.c linux-2.6.38.3/net/ return -EFAULT; =20 return p; -diff -urNp linux-2.6.38.3/net/mac80211/tx.c linux-2.6.38.3/net/mac80211/= tx.c ---- linux-2.6.38.3/net/mac80211/tx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/mac80211/tx.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/mac80211/tx.c linux-2.6.38.4/net/mac80211/= tx.c +--- linux-2.6.38.4/net/mac80211/tx.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/mac80211/tx.c 2011-04-17 15:57:33.000000000 -0400 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct=20 return cpu_to_le16(dur); } @@ -58986,9 +57025,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/tx.c linux= -2.6.38.3/net/mac80211/tx.c struct net_device *dev) { return local =3D=3D wdev_priv(dev->ieee80211_ptr); -diff -urNp linux-2.6.38.3/net/mac80211/util.c linux-2.6.38.3/net/mac8021= 1/util.c ---- linux-2.6.38.3/net/mac80211/util.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/net/mac80211/util.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/net/mac80211/util.c linux-2.6.38.4/net/mac8021= 1/util.c +--- linux-2.6.38.4/net/mac80211/util.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/net/mac80211/util.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -1135,7 +1135,7 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming =3D true; =20 @@ -58998,9 +57037,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/util.c lin= ux-2.6.38.3/net/mac80211/util.c /* * Upon resume hardware can sometimes be goofy due to * various platform / driver / bus issues, so restarting -diff -urNp linux-2.6.38.3/net/netfilter/Kconfig linux-2.6.38.3/net/netfi= lter/Kconfig ---- linux-2.6.38.3/net/netfilter/Kconfig 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/net/netfilter/Kconfig 2011-04-17 15:57:33.000000000 -= 0400 +diff -urNp linux-2.6.38.4/net/netfilter/Kconfig linux-2.6.38.4/net/netfi= lter/Kconfig +--- linux-2.6.38.4/net/netfilter/Kconfig 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/net/netfilter/Kconfig 2011-04-17 15:57:33.000000000 -= 0400 @@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP =20 To compile it as a module, choose M here. If unsure, say N. @@ -59018,9 +57057,9 @@ diff -urNp linux-2.6.38.3/net/netfilter/Kconfig l= inux-2.6.38.3/net/netfilter/Kco config NETFILTER_XT_MATCH_HASHLIMIT tristate '"hashlimit" match support' depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=3Dn) -diff -urNp linux-2.6.38.3/net/netfilter/Makefile linux-2.6.38.3/net/netf= ilter/Makefile ---- linux-2.6.38.3/net/netfilter/Makefile 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/net/netfilter/Makefile 2011-04-17 15:57:33.000000000 = -0400 +diff -urNp linux-2.6.38.4/net/netfilter/Makefile linux-2.6.38.4/net/netf= ilter/Makefile +--- linux-2.6.38.4/net/netfilter/Makefile 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/net/netfilter/Makefile 2011-04-17 15:57:33.000000000 = -0400 @@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) +=3D=20 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=3D xt_dccp.o obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) +=3D xt_dscp.o @@ -59029,9 +57068,9 @@ diff -urNp linux-2.6.38.3/net/netfilter/Makefile = linux-2.6.38.3/net/netfilter/Ma obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) +=3D xt_hashlimit.o obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) +=3D xt_helper.o obj-$(CONFIG_NETFILTER_XT_MATCH_HL) +=3D xt_hl.o -diff -urNp linux-2.6.38.3/net/netfilter/nf_conntrack_netlink.c linux-2.6= .38.3/net/netfilter/nf_conntrack_netlink.c ---- linux-2.6.38.3/net/netfilter/nf_conntrack_netlink.c 2011-03-14 21:20= :32.000000000 -0400 -+++ linux-2.6.38.3/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:57= :33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c linux-2.6= .38.4/net/netfilter/nf_conntrack_netlink.c +--- linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c 2011-03-14 21:20= :32.000000000 -0400 ++++ linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:57= :33.000000000 -0400 @@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla static int ctnetlink_parse_tuple(const struct nlattr * const cda[], @@ -59041,9 +57080,9 @@ diff -urNp linux-2.6.38.3/net/netfilter/nf_conntr= ack_netlink.c linux-2.6.38.3/ne { struct nlattr *tb[CTA_TUPLE_MAX+1]; int err; -diff -urNp linux-2.6.38.3/net/netfilter/xt_gradm.c linux-2.6.38.3/net/ne= tfilter/xt_gradm.c ---- linux-2.6.38.3/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.00000000= 0 -0500 -+++ linux-2.6.38.3/net/netfilter/xt_gradm.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/net/netfilter/xt_gradm.c linux-2.6.38.4/net/ne= tfilter/xt_gradm.c +--- linux-2.6.38.4/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.00000000= 0 -0500 ++++ linux-2.6.38.4/net/netfilter/xt_gradm.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -0,0 +1,51 @@ +/* + * gradm match for netfilter @@ -59096,9 +57135,9 @@ diff -urNp linux-2.6.38.3/net/netfilter/xt_gradm.= c linux-2.6.38.3/net/netfilter/ +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_gradm"); +MODULE_ALIAS("ip6t_gradm"); -diff -urNp linux-2.6.38.3/net/netlink/af_netlink.c linux-2.6.38.3/net/ne= tlink/af_netlink.c ---- linux-2.6.38.3/net/netlink/af_netlink.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/net/netlink/af_netlink.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/net/netlink/af_netlink.c linux-2.6.38.4/net/ne= tlink/af_netlink.c +--- linux-2.6.38.4/net/netlink/af_netlink.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/net/netlink/af_netlink.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -2001,13 +2001,21 @@ static int netlink_seq_show(struct seq_f struct netlink_sock *nlk =3D nlk_sk(s); =20 @@ -59121,9 +57160,9 @@ diff -urNp linux-2.6.38.3/net/netlink/af_netlink.= c linux-2.6.38.3/net/netlink/af atomic_read(&s->sk_refcnt), atomic_read(&s->sk_drops), sock_i_ino(s) -diff -urNp linux-2.6.38.3/net/netrom/af_netrom.c linux-2.6.38.3/net/netr= om/af_netrom.c ---- linux-2.6.38.3/net/netrom/af_netrom.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/net/netrom/af_netrom.c 2011-04-17 15:57:33.000000000 = -0400 +diff -urNp linux-2.6.38.4/net/netrom/af_netrom.c linux-2.6.38.4/net/netr= om/af_netrom.c +--- linux-2.6.38.4/net/netrom/af_netrom.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/net/netrom/af_netrom.c 2011-04-17 15:57:33.000000000 = -0400 @@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc struct sock *sk =3D sock->sk; struct nr_sock *nr =3D nr_sk(sk); @@ -59140,9 +57179,9 @@ diff -urNp linux-2.6.38.3/net/netrom/af_netrom.c = linux-2.6.38.3/net/netrom/af_ne sax->fsa_ax25.sax25_call =3D nr->source_addr; *uaddr_len =3D sizeof(struct sockaddr_ax25); } -diff -urNp linux-2.6.38.3/net/packet/af_packet.c linux-2.6.38.3/net/pack= et/af_packet.c ---- linux-2.6.38.3/net/packet/af_packet.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/net/packet/af_packet.c 2011-04-17 15:57:33.000000000 = -0400 +diff -urNp linux-2.6.38.4/net/packet/af_packet.c linux-2.6.38.4/net/pack= et/af_packet.c +--- linux-2.6.38.4/net/packet/af_packet.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/net/packet/af_packet.c 2011-04-17 15:57:33.000000000 = -0400 @@ -2134,7 +2134,7 @@ static int packet_getsockopt(struct sock case PACKET_HDRLEN: if (len > sizeof(int)) @@ -59173,9 +57212,9 @@ diff -urNp linux-2.6.38.3/net/packet/af_packet.c = linux-2.6.38.3/net/packet/af_pa atomic_read(&s->sk_refcnt), s->sk_type, ntohs(po->num), -diff -urNp linux-2.6.38.3/net/phonet/af_phonet.c linux-2.6.38.3/net/phon= et/af_phonet.c ---- linux-2.6.38.3/net/phonet/af_phonet.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/net/phonet/af_phonet.c 2011-04-17 15:57:33.000000000 = -0400 +diff -urNp linux-2.6.38.4/net/phonet/af_phonet.c linux-2.6.38.4/net/phon= et/af_phonet.c +--- linux-2.6.38.4/net/phonet/af_phonet.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/net/phonet/af_phonet.c 2011-04-17 15:57:33.000000000 = -0400 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr { struct phonet_protocol *pp; @@ -59194,9 +57233,9 @@ diff -urNp linux-2.6.38.3/net/phonet/af_phonet.c = linux-2.6.38.3/net/phonet/af_ph return -EINVAL; =20 err =3D proto_register(pp->prot, 1); -diff -urNp linux-2.6.38.3/net/phonet/socket.c linux-2.6.38.3/net/phonet/= socket.c ---- linux-2.6.38.3/net/phonet/socket.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/net/phonet/socket.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/net/phonet/socket.c linux-2.6.38.4/net/phonet/= socket.c +--- linux-2.6.38.4/net/phonet/socket.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/net/phonet/socket.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -637,7 +637,12 @@ static int pn_sock_seq_show(struct seq_f sk->sk_state, sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), @@ -59211,9 +57250,9 @@ diff -urNp linux-2.6.38.3/net/phonet/socket.c lin= ux-2.6.38.3/net/phonet/socket.c atomic_read(&sk->sk_drops), &len); } seq_printf(seq, "%*s\n", 127 - len, ""); -diff -urNp linux-2.6.38.3/net/sctp/proc.c linux-2.6.38.3/net/sctp/proc.c ---- linux-2.6.38.3/net/sctp/proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/sctp/proc.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/sctp/proc.c linux-2.6.38.4/net/sctp/proc.c +--- linux-2.6.38.4/net/sctp/proc.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/sctp/proc.c 2011-04-17 15:57:33.000000000 -0400 @@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_ sctp_for_each_hentry(epb, node, &head->chain) { ep =3D sctp_ep(epb); @@ -59242,18 +57281,9 @@ diff -urNp linux-2.6.38.3/net/sctp/proc.c linux-= 2.6.38.3/net/sctp/proc.c assoc->state, hash, assoc->assoc_id, assoc->sndbuf_used, -diff -urNp linux-2.6.38.3/net/sctp/socket.c linux-2.6.38.3/net/sctp/sock= et.c ---- linux-2.6.38.3/net/sctp/socket.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/sctp/socket.c 2011-04-17 15:57:33.000000000 -0400 -@@ -1496,7 +1496,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc - struct sctp_sndrcvinfo *sinfo; - struct sctp_initmsg *sinit; - sctp_assoc_t associd =3D 0; -- sctp_cmsgs_t cmsgs =3D { NULL }; -+ sctp_cmsgs_t cmsgs =3D { NULL, NULL }; - int err; - sctp_scope_t scope; - long timeo; +diff -urNp linux-2.6.38.4/net/sctp/socket.c linux-2.6.38.4/net/sctp/sock= et.c +--- linux-2.6.38.4/net/sctp/socket.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/sctp/socket.c 2011-04-23 12:47:28.000000000 -0400 @@ -4435,7 +4435,7 @@ static int sctp_getsockopt_peer_addrs(st addrlen =3D sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; if (space_left < addrlen) @@ -59263,9 +57293,9 @@ diff -urNp linux-2.6.38.3/net/sctp/socket.c linux= -2.6.38.3/net/sctp/socket.c return -EFAULT; to +=3D addrlen; cnt++; -diff -urNp linux-2.6.38.3/net/socket.c linux-2.6.38.3/net/socket.c ---- linux-2.6.38.3/net/socket.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.3/net/socket.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/socket.c linux-2.6.38.4/net/socket.c +--- linux-2.6.38.4/net/socket.c 2011-04-18 17:27:16.000000000 -0400 ++++ linux-2.6.38.4/net/socket.c 2011-04-17 15:57:33.000000000 -0400 @@ -88,6 +88,7 @@ #include #include @@ -59416,9 +57446,9 @@ diff -urNp linux-2.6.38.3/net/socket.c linux-2.6.= 38.3/net/socket.c err =3D security_socket_connect(sock, (struct sockaddr *)&address, addrlen= ); if (err) -diff -urNp linux-2.6.38.3/net/sunrpc/sched.c linux-2.6.38.3/net/sunrpc/s= ched.c ---- linux-2.6.38.3/net/sunrpc/sched.c 2011-04-18 17:27:14.000000000 -040= 0 -+++ linux-2.6.38.3/net/sunrpc/sched.c 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/net/sunrpc/sched.c linux-2.6.38.4/net/sunrpc/s= ched.c +--- linux-2.6.38.4/net/sunrpc/sched.c 2011-04-18 17:27:14.000000000 -040= 0 ++++ linux-2.6.38.4/net/sunrpc/sched.c 2011-04-17 15:57:33.000000000 -040= 0 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w #ifdef RPC_DEBUG static void rpc_task_set_debuginfo(struct rpc_task *task) @@ -59431,9 +57461,9 @@ diff -urNp linux-2.6.38.3/net/sunrpc/sched.c linu= x-2.6.38.3/net/sunrpc/sched.c } #else static inline void rpc_task_set_debuginfo(struct rpc_task *task) -diff -urNp linux-2.6.38.3/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.3/= net/sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.38.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-14 21:20:32.00= 0000000 -0400 -+++ linux-2.6.38.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-17 15:57:33.00= 0000000 -0400 +diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.4/= net/sunrpc/xprtrdma/svc_rdma.c +--- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-14 21:20:32.00= 0000000 -0400 ++++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-17 15:57:33.00= 0000000 -0400 @@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *ta len -=3D *ppos; if (len > *lenp) @@ -59443,9 +57473,9 @@ diff -urNp linux-2.6.38.3/net/sunrpc/xprtrdma/svc= _rdma.c linux-2.6.38.3/net/sunr return -EFAULT; *lenp =3D len; *ppos +=3D len; -diff -urNp linux-2.6.38.3/net/sysctl_net.c linux-2.6.38.3/net/sysctl_net= .c ---- linux-2.6.38.3/net/sysctl_net.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/sysctl_net.c 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/net/sysctl_net.c linux-2.6.38.4/net/sysctl_net= .c +--- linux-2.6.38.4/net/sysctl_net.c 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/net/sysctl_net.c 2011-04-17 15:57:33.000000000 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -59455,24 +57485,9 @@ diff -urNp linux-2.6.38.3/net/sysctl_net.c linux= -2.6.38.3/net/sysctl_net.c int mode =3D (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.38.3/net/tipc/socket.c linux-2.6.38.3/net/tipc/sock= et.c ---- linux-2.6.38.3/net/tipc/socket.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/net/tipc/socket.c 2011-04-17 15:57:33.000000000 -0400 -@@ -1447,8 +1447,9 @@ static int connect(struct socket *sock,=20 - } else { - if (res =3D=3D 0) - res =3D -ETIMEDOUT; -- else -- ; /* leave "res" unchanged */ -+ else { -+ /* leave "res" unchanged */ -+ } - sock->state =3D SS_DISCONNECTING; - } -=20 -diff -urNp linux-2.6.38.3/net/unix/af_unix.c linux-2.6.38.3/net/unix/af_= unix.c ---- linux-2.6.38.3/net/unix/af_unix.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/net/unix/af_unix.c 2011-04-17 15:57:33.000000000 -040= 0 +diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_= unix.c +--- linux-2.6.38.4/net/unix/af_unix.c 2011-03-14 21:20:32.000000000 -040= 0 ++++ linux-2.6.38.4/net/unix/af_unix.c 2011-04-17 15:57:33.000000000 -040= 0 @@ -765,6 +765,12 @@ static struct sock *unix_find_other(stru err =3D -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -59543,21 +57558,9 @@ diff -urNp linux-2.6.38.3/net/unix/af_unix.c lin= ux-2.6.38.3/net/unix/af_unix.c atomic_read(&s->sk_refcnt), 0, s->sk_state =3D=3D TCP_LISTEN ? __SO_ACCEPTCON : 0, -diff -urNp linux-2.6.38.3/net/wireless/reg.c linux-2.6.38.3/net/wireless= /reg.c ---- linux-2.6.38.3/net/wireless/reg.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/net/wireless/reg.c 2011-04-17 15:57:33.000000000 -040= 0 -@@ -54,7 +54,7 @@ - printk(KERN_DEBUG pr_fmt(format), ##args); \ - } while (0) - #else --#define REG_DBG_PRINT(args...) -+#define REG_DBG_PRINT(args...) do {} while (0) - #endif -=20 - /* Receipt of information from last regulatory request */ -diff -urNp linux-2.6.38.3/net/wireless/wext-core.c linux-2.6.38.3/net/wi= reless/wext-core.c ---- linux-2.6.38.3/net/wireless/wext-core.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/net/wireless/wext-core.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/net/wireless/wext-core.c linux-2.6.38.4/net/wi= reless/wext-core.c +--- linux-2.6.38.4/net/wireless/wext-core.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/net/wireless/wext-core.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc */ =20 @@ -59591,22 +57594,9 @@ diff -urNp linux-2.6.38.3/net/wireless/wext-core= .c linux-2.6.38.3/net/wireless/w err =3D handler(dev, info, (union iwreq_data *) iwp, extra); =20 iwp->length +=3D essid_compat; -diff -urNp linux-2.6.38.3/net/x25/x25_facilities.c linux-2.6.38.3/net/x2= 5/x25_facilities.c ---- linux-2.6.38.3/net/x25/x25_facilities.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/net/x25/x25_facilities.c 2011-04-17 15:57:33.00000000= 0 -0400 -@@ -167,7 +167,8 @@ int x25_parse_facilities(struct sk_buff=20 - break; - default: - printk(KERN_DEBUG "X.25: unknown facility %02X," -- "length %d\n", p[0], p[1]); -+ "length %d, values %02X, %02X\n", -+ p[0], p[1], p[2], p[3]); - break; - } - len -=3D p[1] + 2; -diff -urNp linux-2.6.38.3/net/xfrm/xfrm_policy.c linux-2.6.38.3/net/xfrm= /xfrm_policy.c ---- linux-2.6.38.3/net/xfrm/xfrm_policy.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/net/xfrm/xfrm_policy.c 2011-04-17 15:57:33.000000000 = -0400 +diff -urNp linux-2.6.38.4/net/xfrm/xfrm_policy.c linux-2.6.38.4/net/xfrm= /xfrm_policy.c +--- linux-2.6.38.4/net/xfrm/xfrm_policy.c 2011-04-22 19:20:59.000000000 = -0400 ++++ linux-2.6.38.4/net/xfrm/xfrm_policy.c 2011-04-22 19:21:47.000000000 = -0400 @@ -1507,7 +1507,7 @@ free_dst: goto out; } @@ -59634,9 +57624,9 @@ diff -urNp linux-2.6.38.3/net/xfrm/xfrm_policy.c = linux-2.6.38.3/net/xfrm/xfrm_po xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) { #ifdef CONFIG_XFRM_SUB_POLICY -diff -urNp linux-2.6.38.3/scripts/basic/fixdep.c linux-2.6.38.3/scripts/= basic/fixdep.c ---- linux-2.6.38.3/scripts/basic/fixdep.c 2011-03-14 21:20:32.000000000 = -0400 -+++ linux-2.6.38.3/scripts/basic/fixdep.c 2011-04-17 15:57:33.000000000 = -0400 +diff -urNp linux-2.6.38.4/scripts/basic/fixdep.c linux-2.6.38.4/scripts/= basic/fixdep.c +--- linux-2.6.38.4/scripts/basic/fixdep.c 2011-03-14 21:20:32.000000000 = -0400 ++++ linux-2.6.38.4/scripts/basic/fixdep.c 2011-04-17 15:57:33.000000000 = -0400 @@ -235,9 +235,9 @@ static void use_config(const char *m, in =20 static void parse_config_file(const char *map, size_t len) @@ -59658,27 +57648,9 @@ diff -urNp linux-2.6.38.3/scripts/basic/fixdep.c= linux-2.6.38.3/scripts/basic/fi =20 if (*p !=3D INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) !=3D 4 or wrong endianess? %#x\n= ", -diff -urNp linux-2.6.38.3/scripts/kallsyms.c linux-2.6.38.3/scripts/kall= syms.c ---- linux-2.6.38.3/scripts/kallsyms.c 2011-03-14 21:20:32.000000000 -040= 0 -+++ linux-2.6.38.3/scripts/kallsyms.c 2011-04-17 15:57:33.000000000 -040= 0 -@@ -43,10 +43,10 @@ struct text_range { -=20 - static unsigned long long _text; - static struct text_range text_ranges[] =3D { -- { "_stext", "_etext" }, -- { "_sinittext", "_einittext" }, -- { "_stext_l1", "_etext_l1" }, /* Blackfin on-chip L1 inst SRAM */ -- { "_stext_l2", "_etext_l2" }, /* Blackfin on-chip L2 SRAM */ -+ { "_stext", "_etext", 0, 0 }, -+ { "_sinittext", "_einittext", 0, 0 }, -+ { "_stext_l1", "_etext_l1", 0, 0 }, /* Blackfin on-chip L1 inst SRAM= */ -+ { "_stext_l2", "_etext_l2", 0, 0 }, /* Blackfin on-chip L2 SRAM */ - }; - #define text_range_text (&text_ranges[0]) - #define text_range_inittext (&text_ranges[1]) -diff -urNp linux-2.6.38.3/scripts/mod/file2alias.c linux-2.6.38.3/script= s/mod/file2alias.c ---- linux-2.6.38.3/scripts/mod/file2alias.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/scripts/mod/file2alias.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/scripts/mod/file2alias.c linux-2.6.38.4/script= s/mod/file2alias.c +--- linux-2.6.38.4/scripts/mod/file2alias.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/scripts/mod/file2alias.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -59733,9 +57705,9 @@ diff -urNp linux-2.6.38.3/scripts/mod/file2alias.= c linux-2.6.38.3/scripts/mod/fi =20 sprintf(alias, "dmi*"); =20 -diff -urNp linux-2.6.38.3/scripts/mod/modpost.c linux-2.6.38.3/scripts/m= od/modpost.c ---- linux-2.6.38.3/scripts/mod/modpost.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/scripts/mod/modpost.c 2011-04-17 15:57:33.000000000 -= 0400 +diff -urNp linux-2.6.38.4/scripts/mod/modpost.c linux-2.6.38.4/scripts/m= od/modpost.c +--- linux-2.6.38.4/scripts/mod/modpost.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/scripts/mod/modpost.c 2011-04-17 15:57:33.000000000 -= 0400 @@ -896,6 +896,7 @@ enum mismatch { ANY_INIT_TO_ANY_EXIT, ANY_EXIT_TO_ANY_INIT, @@ -59803,9 +57775,9 @@ diff -urNp linux-2.6.38.3/scripts/mod/modpost.c l= inux-2.6.38.3/scripts/mod/modpo goto close_write; =20 tmp =3D NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.38.3/scripts/mod/modpost.h linux-2.6.38.3/scripts/m= od/modpost.h ---- linux-2.6.38.3/scripts/mod/modpost.h 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/scripts/mod/modpost.h 2011-04-17 15:57:33.000000000 -= 0400 +diff -urNp linux-2.6.38.4/scripts/mod/modpost.h linux-2.6.38.4/scripts/m= od/modpost.h +--- linux-2.6.38.4/scripts/mod/modpost.h 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/scripts/mod/modpost.h 2011-04-17 15:57:33.000000000 -= 0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e =20 struct buffer { @@ -59825,9 +57797,9 @@ diff -urNp linux-2.6.38.3/scripts/mod/modpost.h l= inux-2.6.38.3/scripts/mod/modpo =20 struct module { struct module *next; -diff -urNp linux-2.6.38.3/scripts/mod/sumversion.c linux-2.6.38.3/script= s/mod/sumversion.c ---- linux-2.6.38.3/scripts/mod/sumversion.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/scripts/mod/sumversion.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/scripts/mod/sumversion.c linux-2.6.38.4/script= s/mod/sumversion.c +--- linux-2.6.38.4/scripts/mod/sumversion.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/scripts/mod/sumversion.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -470,7 +470,7 @@ static void write_version(const char *fi goto out; } @@ -59837,9 +57809,9 @@ diff -urNp linux-2.6.38.3/scripts/mod/sumversion.= c linux-2.6.38.3/scripts/mod/su warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.38.3/scripts/pnmtologo.c linux-2.6.38.3/scripts/pnm= tologo.c ---- linux-2.6.38.3/scripts/pnmtologo.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/scripts/pnmtologo.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/scripts/pnmtologo.c linux-2.6.38.4/scripts/pnm= tologo.c +--- linux-2.6.38.4/scripts/pnmtologo.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/scripts/pnmtologo.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -59866,9 +57838,9 @@ diff -urNp linux-2.6.38.3/scripts/pnmtologo.c lin= ux-2.6.38.3/scripts/pnmtologo.c logoname); write_hex_cnt =3D 0; for (i =3D 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.38.3/security/apparmor/lsm.c linux-2.6.38.3/securit= y/apparmor/lsm.c ---- linux-2.6.38.3/security/apparmor/lsm.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/security/apparmor/lsm.c 2011-04-17 15:57:33.000000000= -0400 +diff -urNp linux-2.6.38.4/security/apparmor/lsm.c linux-2.6.38.4/securit= y/apparmor/lsm.c +--- linux-2.6.38.4/security/apparmor/lsm.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/security/apparmor/lsm.c 2011-04-17 15:57:33.000000000= -0400 @@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc return error; } @@ -59878,9 +57850,9 @@ diff -urNp linux-2.6.38.3/security/apparmor/lsm.c= linux-2.6.38.3/security/apparm .name =3D "apparmor", =20 .ptrace_access_check =3D apparmor_ptrace_access_check, -diff -urNp linux-2.6.38.3/security/commoncap.c linux-2.6.38.3/security/c= ommoncap.c ---- linux-2.6.38.3/security/commoncap.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/security/commoncap.c 2011-04-17 15:57:33.000000000 -0= 400 +diff -urNp linux-2.6.38.4/security/commoncap.c linux-2.6.38.4/security/c= ommoncap.c +--- linux-2.6.38.4/security/commoncap.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/security/commoncap.c 2011-04-17 15:57:33.000000000 -0= 400 @@ -27,6 +27,7 @@ #include #include @@ -59912,9 +57884,9 @@ diff -urNp linux-2.6.38.3/security/commoncap.c li= nux-2.6.38.3/security/commoncap if (cred->uid !=3D 0) { if (bprm->cap_effective) return 1; -diff -urNp linux-2.6.38.3/security/integrity/ima/ima_api.c linux-2.6.38.= 3/security/integrity/ima/ima_api.c ---- linux-2.6.38.3/security/integrity/ima/ima_api.c 2011-03-14 21:20:32.= 000000000 -0400 -+++ linux-2.6.38.3/security/integrity/ima/ima_api.c 2011-04-17 15:57:33.= 000000000 -0400 +diff -urNp linux-2.6.38.4/security/integrity/ima/ima_api.c linux-2.6.38.= 4/security/integrity/ima/ima_api.c +--- linux-2.6.38.4/security/integrity/ima/ima_api.c 2011-03-14 21:20:32.= 000000000 -0400 ++++ linux-2.6.38.4/security/integrity/ima/ima_api.c 2011-04-17 15:57:33.= 000000000 -0400 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino int result; =20 @@ -59924,9 +57896,9 @@ diff -urNp linux-2.6.38.3/security/integrity/ima/= ima_api.c linux-2.6.38.3/securi =20 entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.38.3/security/integrity/ima/ima_fs.c linux-2.6.38.3= /security/integrity/ima/ima_fs.c ---- linux-2.6.38.3/security/integrity/ima/ima_fs.c 2011-03-14 21:20:32.0= 00000000 -0400 -+++ linux-2.6.38.3/security/integrity/ima/ima_fs.c 2011-04-17 15:57:33.0= 00000000 -0400 +diff -urNp linux-2.6.38.4/security/integrity/ima/ima_fs.c linux-2.6.38.4= /security/integrity/ima/ima_fs.c +--- linux-2.6.38.4/security/integrity/ima/ima_fs.c 2011-03-14 21:20:32.0= 00000000 -0400 ++++ linux-2.6.38.4/security/integrity/ima/ima_fs.c 2011-04-17 15:57:33.0= 00000000 -0400 @@ -28,12 +28,12 @@ static int valid_policy =3D 1; #define TMPBUFLEN 12 @@ -59942,9 +57914,9 @@ diff -urNp linux-2.6.38.3/security/integrity/ima/= ima_fs.c linux-2.6.38.3/securit return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } =20 -diff -urNp linux-2.6.38.3/security/integrity/ima/ima.h linux-2.6.38.3/se= curity/integrity/ima/ima.h ---- linux-2.6.38.3/security/integrity/ima/ima.h 2011-03-14 21:20:32.0000= 00000 -0400 -+++ linux-2.6.38.3/security/integrity/ima/ima.h 2011-04-17 15:57:33.0000= 00000 -0400 +diff -urNp linux-2.6.38.4/security/integrity/ima/ima.h linux-2.6.38.4/se= curity/integrity/ima/ima.h +--- linux-2.6.38.4/security/integrity/ima/ima.h 2011-03-14 21:20:32.0000= 00000 -0400 ++++ linux-2.6.38.4/security/integrity/ima/ima.h 2011-04-17 15:57:33.0000= 00000 -0400 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; =20 @@ -59956,9 +57928,9 @@ diff -urNp linux-2.6.38.3/security/integrity/ima/= ima.h linux-2.6.38.3/security/i struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.38.3/security/integrity/ima/ima_queue.c linux-2.6.3= 8.3/security/integrity/ima/ima_queue.c ---- linux-2.6.38.3/security/integrity/ima/ima_queue.c 2011-03-14 21:20:3= 2.000000000 -0400 -+++ linux-2.6.38.3/security/integrity/ima/ima_queue.c 2011-04-17 15:57:3= 3.000000000 -0400 +diff -urNp linux-2.6.38.4/security/integrity/ima/ima_queue.c linux-2.6.3= 8.4/security/integrity/ima/ima_queue.c +--- linux-2.6.38.4/security/integrity/ima/ima_queue.c 2011-03-14 21:20:3= 2.000000000 -0400 ++++ linux-2.6.38.4/security/integrity/ima/ima_queue.c 2011-04-17 15:57:3= 3.000000000 -0400 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); list_add_tail_rcu(&qe->later, &ima_measurements); @@ -59968,9 +57940,9 @@ diff -urNp linux-2.6.38.3/security/integrity/ima/= ima_queue.c linux-2.6.38.3/secu key =3D ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.38.3/security/Kconfig linux-2.6.38.3/security/Kconf= ig ---- linux-2.6.38.3/security/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.3/security/Kconfig 2011-04-17 15:57:33.000000000 -0400 +diff -urNp linux-2.6.38.4/security/Kconfig linux-2.6.38.4/security/Kconf= ig +--- linux-2.6.38.4/security/Kconfig 2011-03-14 21:20:32.000000000 -0400 ++++ linux-2.6.38.4/security/Kconfig 2011-04-17 15:57:33.000000000 -0400 @@ -4,6 +4,527 @@ =20 menu "Security options" @@ -60508,9 +58480,9 @@ diff -urNp linux-2.6.38.3/security/Kconfig linux-= 2.6.38.3/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.38.3/security/keys/keyring.c linux-2.6.38.3/securit= y/keys/keyring.c ---- linux-2.6.38.3/security/keys/keyring.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/security/keys/keyring.c 2011-04-18 22:03:12.000000000= -0400 +diff -urNp linux-2.6.38.4/security/keys/keyring.c linux-2.6.38.4/securit= y/keys/keyring.c +--- linux-2.6.38.4/security/keys/keyring.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/security/keys/keyring.c 2011-04-18 22:03:12.000000000= -0400 @@ -213,15 +213,15 @@ static long keyring_read(const struct ke ret =3D -EFAULT; =20 @@ -60530,9 +58502,9 @@ diff -urNp linux-2.6.38.3/security/keys/keyring.c= linux-2.6.38.3/security/keys/k goto error; =20 buflen -=3D tmp; -diff -urNp linux-2.6.38.3/security/min_addr.c linux-2.6.38.3/security/mi= n_addr.c ---- linux-2.6.38.3/security/min_addr.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/security/min_addr.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/security/min_addr.c linux-2.6.38.4/security/mi= n_addr.c +--- linux-2.6.38.4/security/min_addr.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/security/min_addr.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr =3D CONFIG */ static void update_mmap_min_addr(void) @@ -60549,9 +58521,9 @@ diff -urNp linux-2.6.38.3/security/min_addr.c lin= ux-2.6.38.3/security/min_addr.c } =20 /* -diff -urNp linux-2.6.38.3/security/security.c linux-2.6.38.3/security/se= curity.c ---- linux-2.6.38.3/security/security.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/security/security.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/security/security.c linux-2.6.38.4/security/se= curity.c +--- linux-2.6.38.4/security/security.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/security/security.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI /* things that live in capability.c */ extern void __init security_fixup_ops(struct security_operations *ops); @@ -60573,9 +58545,9 @@ diff -urNp linux-2.6.38.3/security/security.c lin= ux-2.6.38.3/security/security.c } =20 /* Save user chosen LSM */ -diff -urNp linux-2.6.38.3/security/selinux/hooks.c linux-2.6.38.3/securi= ty/selinux/hooks.c ---- linux-2.6.38.3/security/selinux/hooks.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/security/selinux/hooks.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/security/selinux/hooks.c linux-2.6.38.4/securi= ty/selinux/hooks.c +--- linux-2.6.38.4/security/selinux/hooks.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/security/selinux/hooks.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -90,7 +90,6 @@ #define NUM_SEL_MNT_OPTS 5 =20 @@ -60593,9 +58565,9 @@ diff -urNp linux-2.6.38.3/security/selinux/hooks.= c linux-2.6.38.3/security/selin .name =3D "selinux", =20 .ptrace_access_check =3D selinux_ptrace_access_check, -diff -urNp linux-2.6.38.3/security/smack/smack_lsm.c linux-2.6.38.3/secu= rity/smack/smack_lsm.c ---- linux-2.6.38.3/security/smack/smack_lsm.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/security/smack/smack_lsm.c 2011-04-17 15:57:33.000000= 000 -0400 +diff -urNp linux-2.6.38.4/security/smack/smack_lsm.c linux-2.6.38.4/secu= rity/smack/smack_lsm.c +--- linux-2.6.38.4/security/smack/smack_lsm.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/security/smack/smack_lsm.c 2011-04-17 15:57:33.000000= 000 -0400 @@ -3179,7 +3179,7 @@ static int smack_inode_getsecctx(struct=20 return 0; } @@ -60605,9 +58577,9 @@ diff -urNp linux-2.6.38.3/security/smack/smack_ls= m.c linux-2.6.38.3/security/sma .name =3D "smack", =20 .ptrace_access_check =3D smack_ptrace_access_check, -diff -urNp linux-2.6.38.3/security/tomoyo/tomoyo.c linux-2.6.38.3/securi= ty/tomoyo/tomoyo.c ---- linux-2.6.38.3/security/tomoyo/tomoyo.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/security/tomoyo/tomoyo.c 2011-04-17 15:57:33.00000000= 0 -0400 +diff -urNp linux-2.6.38.4/security/tomoyo/tomoyo.c linux-2.6.38.4/securi= ty/tomoyo/tomoyo.c +--- linux-2.6.38.4/security/tomoyo/tomoyo.c 2011-03-14 21:20:32.00000000= 0 -0400 ++++ linux-2.6.38.4/security/tomoyo/tomoyo.c 2011-04-17 15:57:33.00000000= 0 -0400 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa * tomoyo_security_ops is a "struct security_operations" which is used = for * registering TOMOYO. @@ -60617,9 +58589,9 @@ diff -urNp linux-2.6.38.3/security/tomoyo/tomoyo.= c linux-2.6.38.3/security/tomoy .name =3D "tomoyo", .cred_alloc_blank =3D tomoyo_cred_alloc_blank, .cred_prepare =3D tomoyo_cred_prepare, -diff -urNp linux-2.6.38.3/sound/aoa/codecs/onyx.c linux-2.6.38.3/sound/a= oa/codecs/onyx.c ---- linux-2.6.38.3/sound/aoa/codecs/onyx.c 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/sound/aoa/codecs/onyx.c 2011-04-17 15:57:33.000000000= -0400 +diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.c linux-2.6.38.4/sound/a= oa/codecs/onyx.c +--- linux-2.6.38.4/sound/aoa/codecs/onyx.c 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/sound/aoa/codecs/onyx.c 2011-04-17 15:57:33.000000000= -0400 @@ -54,7 +54,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -60648,9 +58620,9 @@ diff -urNp linux-2.6.38.3/sound/aoa/codecs/onyx.c= linux-2.6.38.3/sound/aoa/codec onyx->spdif_locked =3D onyx->analog_locked =3D 0; mutex_unlock(&onyx->mutex); =20 -diff -urNp linux-2.6.38.3/sound/aoa/codecs/onyx.h linux-2.6.38.3/sound/a= oa/codecs/onyx.h ---- linux-2.6.38.3/sound/aoa/codecs/onyx.h 2011-03-14 21:20:32.000000000= -0400 -+++ linux-2.6.38.3/sound/aoa/codecs/onyx.h 2011-04-17 15:57:33.000000000= -0400 +diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.h linux-2.6.38.4/sound/a= oa/codecs/onyx.h +--- linux-2.6.38.4/sound/aoa/codecs/onyx.h 2011-03-14 21:20:32.000000000= -0400 ++++ linux-2.6.38.4/sound/aoa/codecs/onyx.h 2011-04-17 15:57:33.000000000= -0400 @@ -11,6 +11,7 @@ #include #include @@ -60659,41 +58631,9 @@ diff -urNp linux-2.6.38.3/sound/aoa/codecs/onyx.= h linux-2.6.38.3/sound/aoa/codec =20 /* PCM3052 register definitions */ =20 -diff -urNp linux-2.6.38.3/sound/core/oss/pcm_oss.c linux-2.6.38.3/sound/= core/oss/pcm_oss.c ---- linux-2.6.38.3/sound/core/oss/pcm_oss.c 2011-03-14 21:20:32.00000000= 0 -0400 -+++ linux-2.6.38.3/sound/core/oss/pcm_oss.c 2011-04-17 15:57:33.00000000= 0 -0400 -@@ -2971,8 +2971,8 @@ static void snd_pcm_oss_proc_done(struct - } - } - #else /* !CONFIG_SND_VERBOSE_PROCFS */ --#define snd_pcm_oss_proc_init(pcm) --#define snd_pcm_oss_proc_done(pcm) -+#define snd_pcm_oss_proc_init(pcm) do {} while (0) -+#define snd_pcm_oss_proc_done(pcm) do {} while (0) - #endif /* CONFIG_SND_VERBOSE_PROCFS */ -=20 - /* -diff -urNp linux-2.6.38.3/sound/core/seq/seq_lock.h linux-2.6.38.3/sound= /core/seq/seq_lock.h ---- linux-2.6.38.3/sound/core/seq/seq_lock.h 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/sound/core/seq/seq_lock.h 2011-04-17 15:57:33.0000000= 00 -0400 -@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo - #else /* SMP || CONFIG_SND_DEBUG */ -=20 - typedef spinlock_t snd_use_lock_t; /* dummy */ --#define snd_use_lock_init(lockp) /**/ --#define snd_use_lock_use(lockp) /**/ --#define snd_use_lock_free(lockp) /**/ --#define snd_use_lock_sync(lockp) /**/ -+#define snd_use_lock_init(lockp) do {} while (0) -+#define snd_use_lock_use(lockp) do {} while (0) -+#define snd_use_lock_free(lockp) do {} while (0) -+#define snd_use_lock_sync(lockp) do {} while (0) -=20 - #endif /* SMP || CONFIG_SND_DEBUG */ -=20 -diff -urNp linux-2.6.38.3/sound/drivers/mts64.c linux-2.6.38.3/sound/dri= vers/mts64.c ---- linux-2.6.38.3/sound/drivers/mts64.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/sound/drivers/mts64.c 2011-04-17 15:57:33.000000000 -= 0400 +diff -urNp linux-2.6.38.4/sound/drivers/mts64.c linux-2.6.38.4/sound/dri= vers/mts64.c +--- linux-2.6.38.4/sound/drivers/mts64.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/sound/drivers/mts64.c 2011-04-17 15:57:33.000000000 -= 0400 @@ -28,6 +28,7 @@ #include #include @@ -60750,9 +58690,9 @@ diff -urNp linux-2.6.38.3/sound/drivers/mts64.c l= inux-2.6.38.3/sound/drivers/mts =20 return 0; } -diff -urNp linux-2.6.38.3/sound/drivers/portman2x4.c linux-2.6.38.3/soun= d/drivers/portman2x4.c ---- linux-2.6.38.3/sound/drivers/portman2x4.c 2011-03-14 21:20:32.000000= 000 -0400 -+++ linux-2.6.38.3/sound/drivers/portman2x4.c 2011-04-17 15:57:33.000000= 000 -0400 +diff -urNp linux-2.6.38.4/sound/drivers/portman2x4.c linux-2.6.38.4/soun= d/drivers/portman2x4.c +--- linux-2.6.38.4/sound/drivers/portman2x4.c 2011-03-14 21:20:32.000000= 000 -0400 ++++ linux-2.6.38.4/sound/drivers/portman2x4.c 2011-04-17 15:57:33.000000= 000 -0400 @@ -47,6 +47,7 @@ #include #include @@ -60770,9 +58710,9 @@ diff -urNp linux-2.6.38.3/sound/drivers/portman2x= 4.c linux-2.6.38.3/sound/driver int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.38.3/sound/oss/sb_audio.c linux-2.6.38.3/sound/oss/= sb_audio.c ---- linux-2.6.38.3/sound/oss/sb_audio.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/sound/oss/sb_audio.c 2011-04-17 15:57:33.000000000 -0= 400 +diff -urNp linux-2.6.38.4/sound/oss/sb_audio.c linux-2.6.38.4/sound/oss/= sb_audio.c +--- linux-2.6.38.4/sound/oss/sb_audio.c 2011-03-14 21:20:32.000000000 -0= 400 ++++ linux-2.6.38.4/sound/oss/sb_audio.c 2011-04-17 15:57:33.000000000 -0= 400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 =3D (signed short *)(localbuf + localoffs); while (c) @@ -60782,9 +58722,9 @@ diff -urNp linux-2.6.38.3/sound/oss/sb_audio.c li= nux-2.6.38.3/sound/oss/sb_audio if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.38.3/sound/oss/swarm_cs4297a.c linux-2.6.38.3/sound= /oss/swarm_cs4297a.c ---- linux-2.6.38.3/sound/oss/swarm_cs4297a.c 2011-03-14 21:20:32.0000000= 00 -0400 -+++ linux-2.6.38.3/sound/oss/swarm_cs4297a.c 2011-04-17 15:57:33.0000000= 00 -0400 +diff -urNp linux-2.6.38.4/sound/oss/swarm_cs4297a.c linux-2.6.38.4/sound= /oss/swarm_cs4297a.c +--- linux-2.6.38.4/sound/oss/swarm_cs4297a.c 2011-03-14 21:20:32.0000000= 00 -0400 ++++ linux-2.6.38.4/sound/oss/swarm_cs4297a.c 2011-04-17 15:57:33.0000000= 00 -0400 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void) { struct cs4297a_state *s; @@ -60819,102 +58759,21 @@ diff -urNp linux-2.6.38.3/sound/oss/swarm_cs42= 97a.c linux-2.6.38.3/sound/oss/swa =20 list_add(&s->list, &cs4297a_devs); =20 -diff -urNp linux-2.6.38.3/sound/pci/ac97/ac97_patch.c linux-2.6.38.3/sou= nd/pci/ac97/ac97_patch.c ---- linux-2.6.38.3/sound/pci/ac97/ac97_patch.c 2011-03-14 21:20:32.00000= 0000 -0400 -+++ linux-2.6.38.3/sound/pci/ac97/ac97_patch.c 2011-04-17 15:57:33.00000= 0000 -0400 -@@ -1486,7 +1486,7 @@ static const struct snd_ac97_res_table a - { AC97_VIDEO, 0x9f1f }, - { AC97_AUX, 0x9f1f }, - { AC97_PCM, 0x9f1f }, -- { } /* terminator */ -+ { 0, 0 } /* terminator */ - }; -=20 - static int patch_ad1819(struct snd_ac97 * ac97) -@@ -3864,7 +3864,7 @@ static struct snd_ac97_res_table lm4550_ - { AC97_AUX, 0x1f1f }, - { AC97_PCM, 0x1f1f }, - { AC97_REC_GAIN, 0x0f0f }, -- { } /* terminator */ -+ { 0, 0 } /* terminator */ - }; -=20 - static int patch_lm4550(struct snd_ac97 *ac97) -diff -urNp linux-2.6.38.3/sound/pci/ens1370.c linux-2.6.38.3/sound/pci/e= ns1370.c ---- linux-2.6.38.3/sound/pci/ens1370.c 2011-04-18 17:27:18.000000000 -04= 00 -+++ linux-2.6.38.3/sound/pci/ens1370.c 2011-04-17 16:54:08.000000000 -04= 00 -@@ -453,7 +453,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audio - { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ - { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ - #endif -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.38.3/sound/pci/hda/patch_hdmi.c linux-2.6.38.3/soun= d/pci/hda/patch_hdmi.c ---- linux-2.6.38.3/sound/pci/hda/patch_hdmi.c 2011-04-18 17:27:18.000000= 000 -0400 -+++ linux-2.6.38.3/sound/pci/hda/patch_hdmi.c 2011-04-17 16:54:08.000000= 000 -0400 -@@ -733,10 +733,10 @@ static void hdmi_non_intrinsic_event(str - cp_ready); -=20 - /* TODO */ -- if (cp_state) -- ; -- if (cp_ready) -- ; -+ if (cp_state) { -+ } -+ if (cp_ready) { -+ } - } -=20 -=20 -diff -urNp linux-2.6.38.3/sound/pci/intel8x0.c linux-2.6.38.3/sound/pci/= intel8x0.c ---- linux-2.6.38.3/sound/pci/intel8x0.c 2011-03-14 21:20:32.000000000 -0= 400 -+++ linux-2.6.38.3/sound/pci/intel8x0.c 2011-04-17 15:57:33.000000000 -0= 400 -@@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel - { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ - { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ - { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids); -@@ -2141,7 +2141,7 @@ static struct ac97_quirk ac97_quirks[] _ - .type =3D AC97_TUNE_HP_ONLY - }, - #endif -- { } /* terminator */ -+ { 0, 0, 0, 0, NULL, 0 } /* terminator */ - }; -=20 - static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97= _clock, -diff -urNp linux-2.6.38.3/sound/pci/intel8x0m.c linux-2.6.38.3/sound/pci= /intel8x0m.c ---- linux-2.6.38.3/sound/pci/intel8x0m.c 2011-03-14 21:20:32.000000000 -= 0400 -+++ linux-2.6.38.3/sound/pci/intel8x0m.c 2011-04-17 15:57:33.000000000 -= 0400 -@@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel - { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ - { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ - #endif -- { 0, } -+ { 0, 0, 0, 0, 0, 0, 0 } - }; -=20 - MODULE_DEVICE_TABLE(pci, snd_intel8x0m_ids); +diff -urNp linux-2.6.38.4/sound/pci/intel8x0m.c linux-2.6.38.4/sound/pci= /intel8x0m.c +--- linux-2.6.38.4/sound/pci/intel8x0m.c 2011-03-14 21:20:32.000000000 -= 0400 ++++ linux-2.6.38.4/sound/pci/intel8x0m.c 2011-04-23 12:47:28.000000000 -= 0400 @@ -1264,7 +1264,7 @@ static struct shortname_table { { 0x5455, "ALi M5455" }, { 0x746d, "AMD AMD8111" }, #endif - { 0 }, -+ { 0, NULL }, ++ { 0, }, }; =20 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.38.3/usr/gen_init_cpio.c linux-2.6.38.3/usr/gen_ini= t_cpio.c ---- linux-2.6.38.3/usr/gen_init_cpio.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/usr/gen_init_cpio.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/usr/gen_init_cpio.c linux-2.6.38.4/usr/gen_ini= t_cpio.c +--- linux-2.6.38.4/usr/gen_init_cpio.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/usr/gen_init_cpio.c 2011-04-17 15:57:33.000000000 -04= 00 @@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name, int retval; int rc =3D -1; @@ -60937,9 +58796,9 @@ diff -urNp linux-2.6.38.3/usr/gen_init_cpio.c lin= ux-2.6.38.3/usr/gen_init_cpio.c } else break; } -diff -urNp linux-2.6.38.3/virt/kvm/kvm_main.c linux-2.6.38.3/virt/kvm/kv= m_main.c ---- linux-2.6.38.3/virt/kvm/kvm_main.c 2011-03-14 21:20:32.000000000 -04= 00 -+++ linux-2.6.38.3/virt/kvm/kvm_main.c 2011-04-17 15:57:33.000000000 -04= 00 +diff -urNp linux-2.6.38.4/virt/kvm/kvm_main.c linux-2.6.38.4/virt/kvm/kv= m_main.c +--- linux-2.6.38.4/virt/kvm/kvm_main.c 2011-03-14 21:20:32.000000000 -04= 00 ++++ linux-2.6.38.4/virt/kvm/kvm_main.c 2011-04-23 21:40:37.000000000 -04= 00 @@ -1521,7 +1521,7 @@ static int kvm_vcpu_release(struct inode return 0; } @@ -60967,17 +58826,7 @@ diff -urNp linux-2.6.38.3/virt/kvm/kvm_main.c li= nux-2.6.38.3/virt/kvm/kvm_main.c .unlocked_ioctl =3D kvm_dev_ioctl, .compat_ioctl =3D kvm_dev_ioctl, .llseek =3D noop_llseek, -@@ -2098,6 +2098,9 @@ static struct miscdevice kvm_dev =3D { - KVM_MINOR, - "kvm", - &kvm_chardev_ops, -+ {NULL, NULL}, -+ NULL, -+ NULL - }; -=20 - static void hardware_enable_nolock(void *junk) -@@ -2443,7 +2446,7 @@ static void kvm_sched_out(struct preempt +@@ -2443,7 +2443,7 @@ static void kvm_sched_out(struct preempt kvm_arch_vcpu_put(vcpu); } =20 @@ -60986,3 +58835,12 @@ diff -urNp linux-2.6.38.3/virt/kvm/kvm_main.c li= nux-2.6.38.3/virt/kvm/kvm_main.c struct module *module) { int r; +@@ -2514,7 +2514,7 @@ int kvm_init(void *opaque, unsigned vcpu + if (!vcpu_align) + vcpu_align =3D __alignof__(struct kvm_vcpu); + kvm_vcpu_cache =3D kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align= , +- 0, NULL); ++ SLAB_USERCOPY, NULL); + if (!kvm_vcpu_cache) { + r =3D -ENOMEM; + goto out_free_5; diff --git a/2.6.38/4422_grsec-mute-warnings.patch b/2.6.38/4422_grsec-mu= te-warnings.patch index c921929..e1915d9 100644 --- a/2.6.38/4422_grsec-mute-warnings.patch +++ b/2.6.38/4422_grsec-mute-warnings.patch @@ -1,3 +1,10 @@ +From: Anthony G. Basile +Updated patch for 2.6.32.39. + +The credits/description from the original version of this patch remain a= ccurate +and are included below. + +--- From: Jory A. Pratt Updated patch for kernel 2.6.32 =20 @@ -22,14 +29,14 @@ warning flags of vanilla kernel versions. Acked-by: Christian Heim --- =20 ---- a/Makefile 2009-07-29 05:34:01.695857499 +0100 -+++ b/Makefile 2009-07-29 05:58:15.098857201 +0100 -@@ -233,7 +233,7 @@ +--- a/Makefile 2011-04-27 22:52:14.000000000 -0400 ++++ b/Makefile 2011-04-27 23:01:48.000000000 -0400 +@@ -221,7 +221,7 @@ =20 HOSTCC =3D gcc HOSTCXX =3D g++ --HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 = -fomit-frame-pointer -fno-delete-null-pointer-checks -+HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fo= mit-frame-pointer -fno-delete-null-pointer-checks +-HOSTCFLAGS =3D -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno= -empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-mi= ssing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointe= r-checks ++HOSTCFLAGS =3D -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-em= pty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missi= ng-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-c= hecks HOSTCXXFLAGS =3D -O2 -fno-delete-null-pointer-checks =20 # Decide whether to build built-in, modular, or both.