From 729073b9166bc974869bae0bfdab9840cac8f99d Mon Sep 17 00:00:00 2001 From: tanner Date: Thu, 15 Apr 2010 12:00:44 +0200 Subject: [PATCH] first renamed release maemo24 --- kernel-power-2.6.28/debian/changelog | 11 + kernel-power-2.6.28/debian/control | 32 +- .../debian/kernel-flasher-maemo.postinst.in | 21 - .../debian/kernel-modules-maemo.postinst.in | 14 - .../debian/kernel-modules-maemo.postrm.in | 10 - .../debian/kernel-power-flasher.postinst.in | 21 + .../debian/kernel-power-modules.postinst.in | 14 + .../debian/kernel-power-modules.postrm.in | 10 + kernel-power-2.6.28/debian/patches/2.6.28.10.diff | 2344 +++++------ .../debian/patches/leds-lp5523.diff | 55 + .../debian/patches/maemo-build.diff | 2 +- .../debian/patches/overclock-ideal.diff | 200 - .../debian/patches/overclock-lv.diff | 196 - .../debian/patches/overclock-ulv.diff | 197 - .../debian/patches/overclock-xlv.diff | 196 - kernel-power-2.6.28/debian/patches/overclock.diff | 61 +- kernel-power-2.6.28/debian/patches/series | 4 + kernel-power-2.6.28/debian/patches/squashfs.diff | 4192 ++++++++++++++++++++ kernel-power-2.6.28/debian/patches/trig-keyb.diff | 93 + .../debian/patches/twl-scrollock.diff | 31 + kernel-power-2.6.28/debian/rules | 19 +- kernel-power-2.6.28/debian/rx51maemo_defconfig | 2327 ----------- kernel-power-2.6.28/debian/rx51power_defconfig | 2333 +++++++++++ kernel-power-2.6.28/debian/upstart | 12 - 24 files changed, 7984 insertions(+), 4411 deletions(-) delete mode 100644 kernel-power-2.6.28/debian/kernel-flasher-maemo.postinst.in delete mode 100644 kernel-power-2.6.28/debian/kernel-modules-maemo.postinst.in delete mode 100644 kernel-power-2.6.28/debian/kernel-modules-maemo.postrm.in create mode 100644 kernel-power-2.6.28/debian/kernel-power-flasher.postinst.in create mode 100644 kernel-power-2.6.28/debian/kernel-power-modules.postinst.in create mode 100644 kernel-power-2.6.28/debian/kernel-power-modules.postrm.in create mode 100644 kernel-power-2.6.28/debian/patches/leds-lp5523.diff delete mode 100644 kernel-power-2.6.28/debian/patches/overclock-ideal.diff delete mode 100644 kernel-power-2.6.28/debian/patches/overclock-lv.diff delete mode 100644 kernel-power-2.6.28/debian/patches/overclock-ulv.diff delete mode 100644 kernel-power-2.6.28/debian/patches/overclock-xlv.diff create mode 100644 kernel-power-2.6.28/debian/patches/squashfs.diff create mode 100644 kernel-power-2.6.28/debian/patches/trig-keyb.diff create mode 100644 kernel-power-2.6.28/debian/patches/twl-scrollock.diff delete mode 100644 kernel-power-2.6.28/debian/rx51maemo_defconfig create mode 100644 kernel-power-2.6.28/debian/rx51power_defconfig delete mode 100644 kernel-power-2.6.28/debian/upstart diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog index 5b4b32a..58ece0d 100644 --- a/kernel-power-2.6.28/debian/changelog +++ b/kernel-power-2.6.28/debian/changelog @@ -1,3 +1,14 @@ +kernel-power (2.6.28-maemo24) fremantle; urgency=low + + * renamed package to kernel-power due to trademark issues + * control: updated (renamed to kernel-power*), new features in Provides + * DSP frequencies are specified as MHz + * enabled crypto seqiv and twofish modules + * added patches by Matan Ziv-Av: squashfs and led triggers and bugfixes + * squashfs is build as module + + -- Thomas Tanner Wed, 14 Apr 2010 00:00:00 +0100 + kernel-maemo (2.6.28-maemo22) fremantle; urgency=low * support dsp rate customization via /sys/power/dsp_opps_rate diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control index bc6d18c..ec5d894 100644 --- a/kernel-power-2.6.28/debian/control +++ b/kernel-power-2.6.28/debian/control @@ -1,4 +1,4 @@ -Source: kernel-maemo +Source: kernel-power Section: utils Priority: optional Maintainer: Thomas Tanner @@ -8,13 +8,14 @@ Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen, libncurses5-dev Build-Depends-Indep: bzip2 Standards-Version: 3.8.0 -Package: kernel-flasher-maemo +Package: kernel-power-flasher Section: user/system Architecture: armel -Pre-Depends: kernel-maemo (= ${binary:Version}), kernel-modules-maemo (= ${binary:Version}), softupd (>= 0.4.0) -Recommends: usbip, iptables, mtd-utils, kexec-tools +Pre-Depends: kernel-power (= ${binary:Version}), kernel-power-modules (= ${binary:Version}), softupd (>= 0.4.0) +Conflicts: kernel-flasher-maemo (<= 2.6.28-maemo22), kernel-maemo, kernel-modules-maemo, kernel-headers-maemo, linux-kernel-headers-maemo +Recommends: kernel-power-settings, usbip, iptables, mtd-utils, kexec-tools Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, kernel-feature-xfs, kernel-feature-reiserfs, - kernel-feature-ntfs-read, kernel-feature-udf, kernel-feature-cifs, kernel-feature-automounter, + kernel-feature-ntfs-read, kernel-feature-udf, kernel-feature-cifs, kernel-feature-automounter, kernel-feature-squashfs, kernel-feature-unionfs, kernel-feature-crypto, kernel-feature-dmloop, kernel-feature-utf8, kernel-feature-mousejoy, kernel-feature-usbip, kernel-feature-ppp, kernel-feature-qos, kernel-feature-block2mtd, kernel-feature-kexec, kernel-feature-overclock, kernel-feature-joikuspot, kernel-feature-slip, kernel-feature-battery, kernel-feature-pptp @@ -25,15 +26,16 @@ Description: Linux kernel updater for an enhanced Maemo 5 kernel 2.6.28.10 For discussion and support please visit http://talk.maemo.org/showthread.php?t=43420 . This custom kernel contains additional modules for IPv6, packet filtering, - QoS, NAT, tunneling, kernel configuration, Wifi mesh networking, + QoS, NAT, tunneling, kernel configuration, Wifi mesh networking, builtin ext3 for booting from other media, ext4, XFS, reiserfs, - NTFS read support, ISO9660, UDF, CIFS, automounter, - UNIONFS, device mapper and dm-loop, cryptography, cryptoloop, + NTFS read support, ISO9660, UDF, CIFS, automounter, squashfs, + unionfs, device mapper and dm-loop, cryptography, cryptoloop, EFI partitions, UTF8 codepages, mouse+joystick input, PPP, PPTP, serial support, USB/IP and generic USB device drivers, battery info, overclocking and kexec support. . Warning: Overclocking may damage your device and is at your own risk! + Overclocking is disabled by default and needs to be enabled during runtime. . Known bugs: Touchscreen calibration (osso-applet-screencalibration) is incompatible with the enabled evdev modules. You need to use the stock Nokia kernel for calibration. @@ -106,27 +108,31 @@ XB-Maemo-Icon-26: MDItMDZUMTk6Mjk6MjMrMDE6MDBL9SgPAAAAJXRFWHRtb2RpZnktZGF0ZQAy MDA5LTA5LTI3VDA5OjM1OjM0KzAyOjAwrPojkwAAAABJRU5ErkJggg== -Package: kernel-maemo +Package: kernel-power Architecture: armel +Conflicts: kernel-maemo Description: Flashable Linux kernel This package provides a flashable kernel image. Use the kernel-flasher-maemo package to automatically flash it. -Package: kernel-headers-maemo +Package: kernel-power-headers Architecture: armel Depends: ${shlibs:Depends} +Conflicts: kernel-headers-maemo Description: Linux kernel headers This package provides kernel headers. -Package: linux-kernel-headers-maemo +Package: linux-kernel-power-headers Architecture: armel Depends: ${shlibs:Depends} +Conflicts: linux-kernel-headers-maemo Description: Linux Kernel Headers for development This package provides headers from the Linux kernel. These headers are used by the installed headers for GNU glibc and other system libraries. -Package: kernel-modules-maemo +Package: kernel-power-modules Architecture: armel -Depends: module-init-tools (>= 3.3), kernel-maemo (= ${binary:Version}) +Conflicts: kernel-modules-maemo +Depends: module-init-tools (>= 3.3), kernel-power (= ${binary:Version}) Description: Linux kernel modules This package provides kernel modules for the enhanced Maemo 5 kernel 2.6.28.10 diff --git a/kernel-power-2.6.28/debian/kernel-flasher-maemo.postinst.in b/kernel-power-2.6.28/debian/kernel-flasher-maemo.postinst.in deleted file mode 100644 index e347079..0000000 --- a/kernel-power-2.6.28/debian/kernel-flasher-maemo.postinst.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -KERNEL=/boot/zImage-@VERSION@.fiasco - -FLASHER=/sbin/fiasco-image-update - -# they say this is The Right Way (tm) to check for -# scratchbox environment -if [ -L /targets/links/scratchbox.config ]; then - # hehe - true -else - if [ -f $KERNEL -a -x $FLASHER ]; then - $FLASHER $KERNEL - fi -fi - -#DEBHELPER# - diff --git a/kernel-power-2.6.28/debian/kernel-modules-maemo.postinst.in b/kernel-power-2.6.28/debian/kernel-modules-maemo.postinst.in deleted file mode 100644 index 79dac83..0000000 --- a/kernel-power-2.6.28/debian/kernel-modules-maemo.postinst.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -cd /lib/modules - -rm -f /lib/modules/current -ls -1d * | grep -v current | while read i; do - /sbin/depmod $i || : -done -ln -s @KVER@ /lib/modules/current - -#DEBHELPER# - diff --git a/kernel-power-2.6.28/debian/kernel-modules-maemo.postrm.in b/kernel-power-2.6.28/debian/kernel-modules-maemo.postrm.in deleted file mode 100644 index 885e561..0000000 --- a/kernel-power-2.6.28/debian/kernel-modules-maemo.postrm.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -#set -e - -test -d /lib/modules/@KVER@ && rm -f /lib/modules/@KVER@/modules.* -rm -f /lib/modules/current -ln -s 2.6.28-omap1 /lib/modules/current - -#DEBHELPER# - diff --git a/kernel-power-2.6.28/debian/kernel-power-flasher.postinst.in b/kernel-power-2.6.28/debian/kernel-power-flasher.postinst.in new file mode 100644 index 0000000..e347079 --- /dev/null +++ b/kernel-power-2.6.28/debian/kernel-power-flasher.postinst.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +KERNEL=/boot/zImage-@VERSION@.fiasco + +FLASHER=/sbin/fiasco-image-update + +# they say this is The Right Way (tm) to check for +# scratchbox environment +if [ -L /targets/links/scratchbox.config ]; then + # hehe + true +else + if [ -f $KERNEL -a -x $FLASHER ]; then + $FLASHER $KERNEL + fi +fi + +#DEBHELPER# + diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in new file mode 100644 index 0000000..79dac83 --- /dev/null +++ b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +cd /lib/modules + +rm -f /lib/modules/current +ls -1d * | grep -v current | while read i; do + /sbin/depmod $i || : +done +ln -s @KVER@ /lib/modules/current + +#DEBHELPER# + diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in new file mode 100644 index 0000000..885e561 --- /dev/null +++ b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in @@ -0,0 +1,10 @@ +#!/bin/sh + +#set -e + +test -d /lib/modules/@KVER@ && rm -f /lib/modules/@KVER@/modules.* +rm -f /lib/modules/current +ln -s 2.6.28-omap1 /lib/modules/current + +#DEBHELPER# + diff --git a/kernel-power-2.6.28/debian/patches/2.6.28.10.diff b/kernel-power-2.6.28/debian/patches/2.6.28.10.diff index 38c69cc..d3fcfe8 100644 --- a/kernel-power-2.6.28/debian/patches/2.6.28.10.diff +++ b/kernel-power-2.6.28/debian/patches/2.6.28.10.diff @@ -1,5 +1,5 @@ ---- kernel-maemo-2.6.28.test.orig/Documentation/filesystems/sysfs-pci.txt -+++ kernel-maemo-2.6.28.test/Documentation/filesystems/sysfs-pci.txt +--- kernel-power-2.6.28.orig/Documentation/filesystems/sysfs-pci.txt ++++ kernel-power-2.6.28/Documentation/filesystems/sysfs-pci.txt @@ -9,6 +9,7 @@ | |-- class | |-- config @@ -37,8 +37,8 @@ Accessing legacy resources through sysfs ---------------------------------------- ---- kernel-maemo-2.6.28.test.orig/Documentation/sound/alsa/ALSA-Configuration.txt -+++ kernel-maemo-2.6.28.test/Documentation/sound/alsa/ALSA-Configuration.txt +--- kernel-power-2.6.28.orig/Documentation/sound/alsa/ALSA-Configuration.txt ++++ kernel-power-2.6.28/Documentation/sound/alsa/ALSA-Configuration.txt @@ -979,9 +979,10 @@ 6stack 6-jack, separate surrounds (default) 3stack 3-stack, shared surrounds @@ -51,14 +51,14 @@ AD1988/AD1988B/AD1989A/AD1989B 6stack 6-jack ---- kernel-maemo-2.6.28.test.orig/Makefile -+++ kernel-maemo-2.6.28.test/Makefile +--- kernel-power-2.6.28.orig/Makefile ++++ kernel-power-2.6.28/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 28 --EXTRAVERSION = maemo -+EXTRAVERSION = .10maemo +-EXTRAVERSION = power ++EXTRAVERSION = .10power NAME = Erotic Pickled Herring # *DOCUMENTATION* @@ -72,8 +72,8 @@ # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments # But warn user when we do so warn-assign = \ ---- kernel-maemo-2.6.28.test.orig/arch/Kconfig -+++ kernel-maemo-2.6.28.test/arch/Kconfig +--- kernel-power-2.6.28.orig/arch/Kconfig ++++ kernel-power-2.6.28/arch/Kconfig @@ -60,6 +60,9 @@ See Documentation/unaligned-memory-access.txt for more information on the topic of unaligned memory accesses. @@ -84,8 +84,8 @@ config KRETPROBES def_bool y depends on KPROBES && HAVE_KRETPROBES ---- kernel-maemo-2.6.28.test.orig/arch/alpha/kernel/entry.S -+++ kernel-maemo-2.6.28.test/arch/alpha/kernel/entry.S +--- kernel-power-2.6.28.orig/arch/alpha/kernel/entry.S ++++ kernel-power-2.6.28/arch/alpha/kernel/entry.S @@ -894,9 +894,9 @@ .end sys_getxpid @@ -108,8 +108,8 @@ .align 4 .globl sys_execve ---- kernel-maemo-2.6.28.test.orig/arch/alpha/kernel/irq_srm.c -+++ kernel-maemo-2.6.28.test/arch/alpha/kernel/irq_srm.c +--- kernel-power-2.6.28.orig/arch/alpha/kernel/irq_srm.c ++++ kernel-power-2.6.28/arch/alpha/kernel/irq_srm.c @@ -63,6 +63,8 @@ { long i; @@ -119,8 +119,8 @@ for (i = 16; i < max; ++i) { if (i < 64 && ((ignore_mask >> i) & 1)) continue; ---- kernel-maemo-2.6.28.test.orig/arch/alpha/kernel/systbls.S -+++ kernel-maemo-2.6.28.test/arch/alpha/kernel/systbls.S +--- kernel-power-2.6.28.orig/arch/alpha/kernel/systbls.S ++++ kernel-power-2.6.28/arch/alpha/kernel/systbls.S @@ -52,7 +52,7 @@ .quad sys_setpgid .quad alpha_ni_syscall /* 40 */ @@ -130,8 +130,8 @@ .quad osf_set_program_attributes .quad alpha_ni_syscall .quad sys_open /* 45 */ ---- kernel-maemo-2.6.28.test.orig/arch/arm/kernel/calls.S -+++ kernel-maemo-2.6.28.test/arch/arm/kernel/calls.S +--- kernel-power-2.6.28.orig/arch/arm/kernel/calls.S ++++ kernel-power-2.6.28/arch/arm/kernel/calls.S @@ -98,7 +98,7 @@ CALL(sys_uselib) CALL(sys_swapon) @@ -141,8 +141,8 @@ /* 90 */ CALL(OBSOLETE(old_mmap)) /* used by libc4 */ CALL(sys_munmap) CALL(sys_truncate) ---- kernel-maemo-2.6.28.test.orig/arch/arm/mach-rpc/riscpc.c -+++ kernel-maemo-2.6.28.test/arch/arm/mach-rpc/riscpc.c +--- kernel-power-2.6.28.orig/arch/arm/mach-rpc/riscpc.c ++++ kernel-power-2.6.28/arch/arm/mach-rpc/riscpc.c @@ -19,6 +19,7 @@ #include #include @@ -165,8 +165,8 @@ return platform_add_devices(devs, ARRAY_SIZE(devs)); } ---- kernel-maemo-2.6.28.test.orig/arch/cris/arch-v10/kernel/entry.S -+++ kernel-maemo-2.6.28.test/arch/cris/arch-v10/kernel/entry.S +--- kernel-power-2.6.28.orig/arch/cris/arch-v10/kernel/entry.S ++++ kernel-power-2.6.28/arch/cris/arch-v10/kernel/entry.S @@ -691,7 +691,7 @@ .long sys_uselib .long sys_swapon @@ -176,8 +176,8 @@ .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate ---- kernel-maemo-2.6.28.test.orig/arch/cris/arch-v32/kernel/entry.S -+++ kernel-maemo-2.6.28.test/arch/cris/arch-v32/kernel/entry.S +--- kernel-power-2.6.28.orig/arch/cris/arch-v32/kernel/entry.S ++++ kernel-power-2.6.28/arch/cris/arch-v32/kernel/entry.S @@ -614,7 +614,7 @@ .long sys_uselib .long sys_swapon @@ -187,8 +187,8 @@ .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate ---- kernel-maemo-2.6.28.test.orig/arch/h8300/kernel/syscalls.S -+++ kernel-maemo-2.6.28.test/arch/h8300/kernel/syscalls.S +--- kernel-power-2.6.28.orig/arch/h8300/kernel/syscalls.S ++++ kernel-power-2.6.28/arch/h8300/kernel/syscalls.S @@ -103,7 +103,7 @@ .long SYMBOL_NAME(sys_uselib) .long SYMBOL_NAME(sys_swapon) @@ -198,8 +198,8 @@ .long SYMBOL_NAME(old_mmap) /* 90 */ .long SYMBOL_NAME(sys_munmap) .long SYMBOL_NAME(sys_truncate) ---- kernel-maemo-2.6.28.test.orig/arch/ia64/Kconfig -+++ kernel-maemo-2.6.28.test/arch/ia64/Kconfig +--- kernel-power-2.6.28.orig/arch/ia64/Kconfig ++++ kernel-power-2.6.28/arch/ia64/Kconfig @@ -17,6 +17,7 @@ select ACPI if (!IA64_HP_SIM) select PM if (!IA64_HP_SIM) @@ -218,8 +218,8 @@ config HAVE_ARCH_NODEDATA_EXTENSION def_bool y ---- kernel-maemo-2.6.28.test.orig/arch/ia64/ia32/ia32_entry.S -+++ kernel-maemo-2.6.28.test/arch/ia64/ia32/ia32_entry.S +--- kernel-power-2.6.28.orig/arch/ia64/ia32/ia32_entry.S ++++ kernel-power-2.6.28/arch/ia64/ia32/ia32_entry.S @@ -220,7 +220,7 @@ data8 sys_mkdir data8 sys_rmdir /* 40 */ @@ -229,8 +229,8 @@ data8 compat_sys_times data8 sys_ni_syscall /* old prof syscall holder */ data8 sys32_brk /* 45 */ ---- kernel-maemo-2.6.28.test.orig/arch/ia64/include/asm/mmzone.h -+++ kernel-maemo-2.6.28.test/arch/ia64/include/asm/mmzone.h +--- kernel-power-2.6.28.orig/arch/ia64/include/asm/mmzone.h ++++ kernel-power-2.6.28/arch/ia64/include/asm/mmzone.h @@ -31,10 +31,6 @@ #endif } @@ -242,8 +242,8 @@ #ifdef CONFIG_IA64_DIG /* DIG systems are small */ # define MAX_PHYSNODE_ID 8 # define NR_NODE_MEMBLKS (MAX_NUMNODES * 8) ---- kernel-maemo-2.6.28.test.orig/arch/ia64/include/asm/unistd.h -+++ kernel-maemo-2.6.28.test/arch/ia64/include/asm/unistd.h +--- kernel-power-2.6.28.orig/arch/ia64/include/asm/unistd.h ++++ kernel-power-2.6.28/arch/ia64/include/asm/unistd.h @@ -364,7 +364,7 @@ struct sigaction; long sys_execve(char __user *filename, char __user * __user *argv, @@ -253,8 +253,8 @@ asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act, struct sigaction __user *oact, ---- kernel-maemo-2.6.28.test.orig/arch/ia64/kernel/entry.S -+++ kernel-maemo-2.6.28.test/arch/ia64/kernel/entry.S +--- kernel-power-2.6.28.orig/arch/ia64/kernel/entry.S ++++ kernel-power-2.6.28/arch/ia64/kernel/entry.S @@ -1442,7 +1442,7 @@ data8 sys_mkdir // 1055 data8 sys_rmdir @@ -264,8 +264,8 @@ data8 sys_times data8 ia64_brk // 1060 data8 sys_setgid ---- kernel-maemo-2.6.28.test.orig/arch/ia64/kernel/sys_ia64.c -+++ kernel-maemo-2.6.28.test/arch/ia64/kernel/sys_ia64.c +--- kernel-power-2.6.28.orig/arch/ia64/kernel/sys_ia64.c ++++ kernel-power-2.6.28/arch/ia64/kernel/sys_ia64.c @@ -154,7 +154,7 @@ * and r9) as this is faster than doing a copy_to_user(). */ @@ -275,8 +275,8 @@ { struct pt_regs *regs = task_pt_regs(current); int fd[2]; ---- kernel-maemo-2.6.28.test.orig/arch/ia64/mm/numa.c -+++ kernel-maemo-2.6.28.test/arch/ia64/mm/numa.c +--- kernel-power-2.6.28.orig/arch/ia64/mm/numa.c ++++ kernel-power-2.6.28/arch/ia64/mm/numa.c @@ -58,7 +58,7 @@ * SPARSEMEM to allocate the SPARSEMEM sectionmap on the NUMA node where * the section resides. @@ -295,8 +295,8 @@ } #ifdef CONFIG_MEMORY_HOTPLUG ---- kernel-maemo-2.6.28.test.orig/arch/ia64/sn/kernel/io_acpi_init.c -+++ kernel-maemo-2.6.28.test/arch/ia64/sn/kernel/io_acpi_init.c +--- kernel-power-2.6.28.orig/arch/ia64/sn/kernel/io_acpi_init.c ++++ kernel-power-2.6.28/arch/ia64/sn/kernel/io_acpi_init.c @@ -434,7 +434,7 @@ size = pci_resource_len(dev, PCI_ROM_RESOURCE); addr = ioremap(pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE], @@ -306,8 +306,8 @@ dev->resource[PCI_ROM_RESOURCE].start = (unsigned long) addr; dev->resource[PCI_ROM_RESOURCE].end = (unsigned long) addr + image_size - 1; ---- kernel-maemo-2.6.28.test.orig/arch/ia64/sn/kernel/io_init.c -+++ kernel-maemo-2.6.28.test/arch/ia64/sn/kernel/io_init.c +--- kernel-power-2.6.28.orig/arch/ia64/sn/kernel/io_init.c ++++ kernel-power-2.6.28/arch/ia64/sn/kernel/io_init.c @@ -269,7 +269,7 @@ rom = ioremap(pci_resource_start(dev, PCI_ROM_RESOURCE), @@ -317,8 +317,8 @@ dev->resource[PCI_ROM_RESOURCE].end = dev->resource[PCI_ROM_RESOURCE].start + image_size - 1; ---- kernel-maemo-2.6.28.test.orig/arch/m68k/kernel/entry.S -+++ kernel-maemo-2.6.28.test/arch/m68k/kernel/entry.S +--- kernel-power-2.6.28.orig/arch/m68k/kernel/entry.S ++++ kernel-power-2.6.28/arch/m68k/kernel/entry.S @@ -513,7 +513,7 @@ .long sys_uselib .long sys_swapon @@ -328,8 +328,8 @@ .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate ---- kernel-maemo-2.6.28.test.orig/arch/m68knommu/Kconfig -+++ kernel-maemo-2.6.28.test/arch/m68knommu/Kconfig +--- kernel-power-2.6.28.orig/arch/m68knommu/Kconfig ++++ kernel-power-2.6.28/arch/m68knommu/Kconfig @@ -14,6 +14,10 @@ bool default n @@ -341,8 +341,8 @@ config FPU bool default n ---- kernel-maemo-2.6.28.test.orig/arch/m68knommu/kernel/syscalltable.S -+++ kernel-maemo-2.6.28.test/arch/m68knommu/kernel/syscalltable.S +--- kernel-power-2.6.28.orig/arch/m68knommu/kernel/syscalltable.S ++++ kernel-power-2.6.28/arch/m68knommu/kernel/syscalltable.S @@ -107,7 +107,7 @@ .long sys_uselib .long sys_ni_syscall /* sys_swapon */ @@ -352,8 +352,8 @@ .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate ---- kernel-maemo-2.6.28.test.orig/arch/mips/include/asm/compat.h -+++ kernel-maemo-2.6.28.test/arch/mips/include/asm/compat.h +--- kernel-power-2.6.28.orig/arch/mips/include/asm/compat.h ++++ kernel-power-2.6.28/arch/mips/include/asm/compat.h @@ -3,6 +3,8 @@ /* * Architecture specific compatibility types @@ -373,8 +373,8 @@ +} + #endif /* _ASM_COMPAT_H */ ---- kernel-maemo-2.6.28.test.orig/arch/mips/include/asm/seccomp.h -+++ kernel-maemo-2.6.28.test/arch/mips/include/asm/seccomp.h +--- kernel-power-2.6.28.orig/arch/mips/include/asm/seccomp.h ++++ kernel-power-2.6.28/arch/mips/include/asm/seccomp.h @@ -1,6 +1,5 @@ #ifndef __ASM_SECCOMP_H @@ -382,8 +382,8 @@ #include #define __NR_seccomp_read __NR_read ---- kernel-maemo-2.6.28.test.orig/arch/mips/kernel/scall32-o32.S -+++ kernel-maemo-2.6.28.test/arch/mips/kernel/scall32-o32.S +--- kernel-power-2.6.28.orig/arch/mips/kernel/scall32-o32.S ++++ kernel-power-2.6.28/arch/mips/kernel/scall32-o32.S @@ -398,7 +398,7 @@ sys sys_uselib 1 sys sys_swapon 2 @@ -393,8 +393,8 @@ sys old_mmap 6 /* 4090 */ sys sys_munmap 2 sys sys_truncate 2 ---- kernel-maemo-2.6.28.test.orig/arch/mn10300/kernel/entry.S -+++ kernel-maemo-2.6.28.test/arch/mn10300/kernel/entry.S +--- kernel-power-2.6.28.orig/arch/mn10300/kernel/entry.S ++++ kernel-power-2.6.28/arch/mn10300/kernel/entry.S @@ -478,7 +478,7 @@ .long sys_uselib .long sys_swapon @@ -404,8 +404,8 @@ .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/Kconfig -+++ kernel-maemo-2.6.28.test/arch/powerpc/Kconfig +--- kernel-power-2.6.28.orig/arch/powerpc/Kconfig ++++ kernel-power-2.6.28/arch/powerpc/Kconfig @@ -121,6 +121,7 @@ select HAVE_DMA_ATTRS if PPC64 select USE_GENERIC_SMP_HELPERS if SMP @@ -414,8 +414,8 @@ config EARLY_PRINTK bool ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/include/asm/compat.h -+++ kernel-maemo-2.6.28.test/arch/powerpc/include/asm/compat.h +--- kernel-power-2.6.28.orig/arch/powerpc/include/asm/compat.h ++++ kernel-power-2.6.28/arch/powerpc/include/asm/compat.h @@ -210,5 +210,10 @@ compat_ulong_t __unused6; }; @@ -427,8 +427,8 @@ + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_COMPAT_H */ ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/include/asm/futex.h -+++ kernel-maemo-2.6.28.test/arch/powerpc/include/asm/futex.h +--- kernel-power-2.6.28.orig/arch/powerpc/include/asm/futex.h ++++ kernel-power-2.6.28/arch/powerpc/include/asm/futex.h @@ -27,7 +27,7 @@ PPC_LONG "1b,4b,2b,4b\n" \ ".previous" \ @@ -463,8 +463,8 @@ break; default: ret = -ENOSYS; ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/include/asm/processor.h -+++ kernel-maemo-2.6.28.test/arch/powerpc/include/asm/processor.h +--- kernel-power-2.6.28.orig/arch/powerpc/include/asm/processor.h ++++ kernel-power-2.6.28/arch/powerpc/include/asm/processor.h @@ -309,6 +309,25 @@ #define HAVE_ARCH_PICK_MMAP_LAYOUT #endif @@ -491,8 +491,8 @@ #endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_PROCESSOR_H */ ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/include/asm/seccomp.h -+++ kernel-maemo-2.6.28.test/arch/powerpc/include/asm/seccomp.h +--- kernel-power-2.6.28.orig/arch/powerpc/include/asm/seccomp.h ++++ kernel-power-2.6.28/arch/powerpc/include/asm/seccomp.h @@ -1,10 +1,6 @@ #ifndef _ASM_POWERPC_SECCOMP_H #define _ASM_POWERPC_SECCOMP_H @@ -504,8 +504,8 @@ #include #define __NR_seccomp_read __NR_read ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/include/asm/systbl.h -+++ kernel-maemo-2.6.28.test/arch/powerpc/include/asm/systbl.h +--- kernel-power-2.6.28.orig/arch/powerpc/include/asm/systbl.h ++++ kernel-power-2.6.28/arch/powerpc/include/asm/systbl.h @@ -92,7 +92,7 @@ SYSCALL(uselib) SYSCALL(swapon) @@ -515,8 +515,8 @@ SYSCALL_SPU(mmap) SYSCALL_SPU(munmap) SYSCALL_SPU(truncate) ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/kernel/align.c -+++ kernel-maemo-2.6.28.test/arch/powerpc/kernel/align.c +--- kernel-power-2.6.28.orig/arch/powerpc/kernel/align.c ++++ kernel-power-2.6.28/arch/powerpc/kernel/align.c @@ -367,27 +367,24 @@ static int emulate_fp_pair(unsigned char __user *addr, unsigned int reg, unsigned int flags) @@ -576,8 +576,8 @@ if (flags & ST) ret = __copy_to_user(addr, ptr, length); else { ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/kernel/signal.c -+++ kernel-maemo-2.6.28.test/arch/powerpc/kernel/signal.c +--- kernel-power-2.6.28.orig/arch/powerpc/kernel/signal.c ++++ kernel-power-2.6.28/arch/powerpc/kernel/signal.c @@ -26,12 +26,12 @@ * Allocate space for the signal frame */ @@ -593,8 +593,8 @@ /* Check for alt stack */ if ((ka->sa.sa_flags & SA_ONSTACK) && ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/kernel/signal.h -+++ kernel-maemo-2.6.28.test/arch/powerpc/kernel/signal.h +--- kernel-power-2.6.28.orig/arch/powerpc/kernel/signal.h ++++ kernel-power-2.6.28/arch/powerpc/kernel/signal.h @@ -15,7 +15,7 @@ extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags); @@ -604,8 +604,8 @@ extern void restore_sigmask(sigset_t *set); extern int handle_signal32(unsigned long sig, struct k_sigaction *ka, ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/kernel/signal_32.c -+++ kernel-maemo-2.6.28.test/arch/powerpc/kernel/signal_32.c +--- kernel-power-2.6.28.orig/arch/powerpc/kernel/signal_32.c ++++ kernel-power-2.6.28/arch/powerpc/kernel/signal_32.c @@ -836,7 +836,7 @@ /* Set up Signal Frame */ @@ -624,8 +624,8 @@ if (unlikely(frame == NULL)) goto badframe; sc = (struct sigcontext __user *) &frame->sctx; ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/kernel/signal_64.c -+++ kernel-maemo-2.6.28.test/arch/powerpc/kernel/signal_64.c +--- kernel-power-2.6.28.orig/arch/powerpc/kernel/signal_64.c ++++ kernel-power-2.6.28/arch/powerpc/kernel/signal_64.c @@ -402,7 +402,7 @@ unsigned long newsp = 0; long err = 0; @@ -635,8 +635,8 @@ if (unlikely(frame == NULL)) goto badframe; ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/mm/fsl_booke_mmu.c -+++ kernel-maemo-2.6.28.test/arch/powerpc/mm/fsl_booke_mmu.c +--- kernel-power-2.6.28.orig/arch/powerpc/mm/fsl_booke_mmu.c ++++ kernel-power-2.6.28/arch/powerpc/mm/fsl_booke_mmu.c @@ -80,7 +80,7 @@ /* * Return PA for this VA if it is mapped by a CAM, or 0 @@ -655,8 +655,8 @@ { int b; for (b = 0; b < tlbcam_index; ++b) ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/mm/pgtable_32.c -+++ kernel-maemo-2.6.28.test/arch/powerpc/mm/pgtable_32.c +--- kernel-power-2.6.28.orig/arch/powerpc/mm/pgtable_32.c ++++ kernel-power-2.6.28/arch/powerpc/mm/pgtable_32.c @@ -65,8 +65,8 @@ #ifdef HAVE_TLBCAM @@ -668,8 +668,8 @@ #else /* !HAVE_TLBCAM */ #define v_mapped_by_tlbcam(x) (0UL) #define p_mapped_by_tlbcam(x) (0UL) ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/mm/slice.c -+++ kernel-maemo-2.6.28.test/arch/powerpc/mm/slice.c +--- kernel-power-2.6.28.orig/arch/powerpc/mm/slice.c ++++ kernel-power-2.6.28/arch/powerpc/mm/slice.c @@ -710,9 +710,18 @@ unsigned long len) { @@ -690,8 +690,8 @@ #if 0 /* too verbose */ slice_dbg("is_hugepage_only_range(mm=%p, addr=%lx, len=%lx)\n", ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/platforms/pseries/Kconfig -+++ kernel-maemo-2.6.28.test/arch/powerpc/platforms/pseries/Kconfig +--- kernel-power-2.6.28.orig/arch/powerpc/platforms/pseries/Kconfig ++++ kernel-power-2.6.28/arch/powerpc/platforms/pseries/Kconfig @@ -54,7 +54,7 @@ config CMM @@ -701,8 +701,8 @@ default y help Select this option, if you want to enable the kernel interface ---- kernel-maemo-2.6.28.test.orig/arch/powerpc/sysdev/fsl_soc.c -+++ kernel-maemo-2.6.28.test/arch/powerpc/sysdev/fsl_soc.c +--- kernel-power-2.6.28.orig/arch/powerpc/sysdev/fsl_soc.c ++++ kernel-power-2.6.28/arch/powerpc/sysdev/fsl_soc.c @@ -257,7 +257,7 @@ gfar_mdio_of_init_one(np); @@ -712,8 +712,8 @@ gfar_mdio_of_init_one(np); return 0; ---- kernel-maemo-2.6.28.test.orig/arch/s390/Kconfig -+++ kernel-maemo-2.6.28.test/arch/s390/Kconfig +--- kernel-power-2.6.28.orig/arch/s390/Kconfig ++++ kernel-power-2.6.28/arch/s390/Kconfig @@ -70,6 +70,7 @@ config S390 @@ -722,8 +722,8 @@ select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES ---- kernel-maemo-2.6.28.test.orig/arch/s390/kernel/compat_wrapper.S -+++ kernel-maemo-2.6.28.test/arch/s390/kernel/compat_wrapper.S +--- kernel-power-2.6.28.orig/arch/s390/kernel/compat_wrapper.S ++++ kernel-power-2.6.28/arch/s390/kernel/compat_wrapper.S @@ -547,7 +547,7 @@ .globl sys32_newuname_wrapper sys32_newuname_wrapper: @@ -742,8 +742,8 @@ .globl sys32_setfsuid16_wrapper sys32_setfsuid16_wrapper: ---- kernel-maemo-2.6.28.test.orig/arch/s390/kernel/entry.h -+++ kernel-maemo-2.6.28.test/arch/s390/kernel/entry.h +--- kernel-power-2.6.28.orig/arch/s390/kernel/entry.h ++++ kernel-power-2.6.28/arch/s390/kernel/entry.h @@ -30,23 +30,23 @@ struct old_sigaction; struct sel_arg_struct; @@ -776,8 +776,8 @@ long sys_sigaction(int sig, const struct old_sigaction __user *act, struct old_sigaction __user *oact); long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss); ---- kernel-maemo-2.6.28.test.orig/arch/s390/kernel/process.c -+++ kernel-maemo-2.6.28.test/arch/s390/kernel/process.c +--- kernel-power-2.6.28.orig/arch/s390/kernel/process.c ++++ kernel-power-2.6.28/arch/s390/kernel/process.c @@ -38,6 +38,7 @@ #include #include @@ -820,8 +820,8 @@ { struct pt_regs *regs = task_pt_regs(current); char *filename; ---- kernel-maemo-2.6.28.test.orig/arch/s390/kernel/signal.c -+++ kernel-maemo-2.6.28.test/arch/s390/kernel/signal.c +--- kernel-power-2.6.28.orig/arch/s390/kernel/signal.c ++++ kernel-power-2.6.28/arch/s390/kernel/signal.c @@ -25,6 +25,7 @@ #include #include @@ -888,8 +888,8 @@ { struct pt_regs *regs = task_pt_regs(current); rt_sigframe __user *frame = (rt_sigframe __user *)regs->gprs[15]; ---- kernel-maemo-2.6.28.test.orig/arch/s390/kernel/sys_s390.c -+++ kernel-maemo-2.6.28.test/arch/s390/kernel/sys_s390.c +--- kernel-power-2.6.28.orig/arch/s390/kernel/sys_s390.c ++++ kernel-power-2.6.28/arch/s390/kernel/sys_s390.c @@ -29,6 +29,7 @@ #include #include @@ -1002,8 +1002,8 @@ +#endif + #endif ---- kernel-maemo-2.6.28.test.orig/arch/s390/kernel/syscalls.S -+++ kernel-maemo-2.6.28.test/arch/s390/kernel/syscalls.S +--- kernel-power-2.6.28.orig/arch/s390/kernel/syscalls.S ++++ kernel-power-2.6.28/arch/s390/kernel/syscalls.S @@ -98,7 +98,7 @@ SYSCALL(sys_swapon,sys_swapon,sys32_swapon_wrapper) SYSCALL(sys_reboot,sys_reboot,sys32_reboot_wrapper) @@ -1058,8 +1058,8 @@ SYSCALL(sys_utimensat,sys_utimensat,compat_sys_utimensat_wrapper) /* 315 */ SYSCALL(sys_signalfd,sys_signalfd,compat_sys_signalfd_wrapper) NI_SYSCALL /* 317 old sys_timer_fd */ ---- kernel-maemo-2.6.28.test.orig/arch/s390/lib/div64.c -+++ kernel-maemo-2.6.28.test/arch/s390/lib/div64.c +--- kernel-power-2.6.28.orig/arch/s390/lib/div64.c ++++ kernel-power-2.6.28/arch/s390/lib/div64.c @@ -61,7 +61,7 @@ " clr %0,%3\n" " jl 0f\n" @@ -1069,8 +1069,8 @@ "0:\n" : "+d" (reg2), "+d" (reg3), "=d" (tmp) : "d" (base), "2" (1UL) : "cc" ); ---- kernel-maemo-2.6.28.test.orig/arch/sh/include/asm/syscalls_32.h -+++ kernel-maemo-2.6.28.test/arch/sh/include/asm/syscalls_32.h +--- kernel-power-2.6.28.orig/arch/sh/include/asm/syscalls_32.h ++++ kernel-power-2.6.28/arch/sh/include/asm/syscalls_32.h @@ -36,9 +36,9 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, @@ -1084,8 +1084,8 @@ asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char __user *buf, size_t count, long dummy, loff_t pos); asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char __user *buf, ---- kernel-maemo-2.6.28.test.orig/arch/sh/kernel/sys_sh32.c -+++ kernel-maemo-2.6.28.test/arch/sh/kernel/sys_sh32.c +--- kernel-power-2.6.28.orig/arch/sh/kernel/sys_sh32.c ++++ kernel-power-2.6.28/arch/sh/kernel/sys_sh32.c @@ -22,7 +22,7 @@ * sys_pipe() is the normal C calling standard for creating * a pipe. It's not the way Unix traditionally does this, though. @@ -1095,8 +1095,8 @@ unsigned long r6, unsigned long r7, struct pt_regs __regs) { ---- kernel-maemo-2.6.28.test.orig/arch/sh/kernel/syscalls_32.S -+++ kernel-maemo-2.6.28.test/arch/sh/kernel/syscalls_32.S +--- kernel-power-2.6.28.orig/arch/sh/kernel/syscalls_32.S ++++ kernel-power-2.6.28/arch/sh/kernel/syscalls_32.S @@ -58,7 +58,7 @@ .long sys_mkdir .long sys_rmdir /* 40 */ @@ -1115,8 +1115,8 @@ .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate ---- kernel-maemo-2.6.28.test.orig/arch/sh/kernel/syscalls_64.S -+++ kernel-maemo-2.6.28.test/arch/sh/kernel/syscalls_64.S +--- kernel-power-2.6.28.orig/arch/sh/kernel/syscalls_64.S ++++ kernel-power-2.6.28/arch/sh/kernel/syscalls_64.S @@ -109,7 +109,7 @@ .long sys_uselib .long sys_swapon @@ -1126,8 +1126,8 @@ .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate ---- kernel-maemo-2.6.28.test.orig/arch/sparc/include/asm/compat.h -+++ kernel-maemo-2.6.28.test/arch/sparc/include/asm/compat.h +--- kernel-power-2.6.28.orig/arch/sparc/include/asm/compat.h ++++ kernel-power-2.6.28/arch/sparc/include/asm/compat.h @@ -240,4 +240,9 @@ unsigned int __unused2; }; @@ -1138,8 +1138,8 @@ +} + #endif /* _ASM_SPARC64_COMPAT_H */ ---- kernel-maemo-2.6.28.test.orig/arch/sparc/include/asm/seccomp.h -+++ kernel-maemo-2.6.28.test/arch/sparc/include/asm/seccomp.h +--- kernel-power-2.6.28.orig/arch/sparc/include/asm/seccomp.h ++++ kernel-power-2.6.28/arch/sparc/include/asm/seccomp.h @@ -1,11 +1,5 @@ #ifndef _ASM_SECCOMP_H @@ -1152,8 +1152,8 @@ #include #define __NR_seccomp_read __NR_read ---- kernel-maemo-2.6.28.test.orig/arch/sparc/kernel/entry.S -+++ kernel-maemo-2.6.28.test/arch/sparc/kernel/entry.S +--- kernel-power-2.6.28.orig/arch/sparc/kernel/entry.S ++++ kernel-power-2.6.28/arch/sparc/kernel/entry.S @@ -1088,8 +1088,8 @@ ld [%sp + STACKFRAME_SZ + PT_I0], %o0 @@ -1165,8 +1165,8 @@ mov %o7, %l5 add %sp, STACKFRAME_SZ, %o0 ! pt_regs *regs arg call sparc_pipe ---- kernel-maemo-2.6.28.test.orig/arch/sparc/kernel/systbls.S -+++ kernel-maemo-2.6.28.test/arch/sparc/kernel/systbls.S +--- kernel-power-2.6.28.orig/arch/sparc/kernel/systbls.S ++++ kernel-power-2.6.28/arch/sparc/kernel/systbls.S @@ -24,7 +24,7 @@ /*25*/ .long sys_vmsplice, sys_ptrace, sys_alarm, sys_sigaltstack, sys_pause /*30*/ .long sys_utime, sys_lchown, sys_fchown, sys_access, sys_nice @@ -1185,8 +1185,8 @@ /*205*/ .long sys_readahead, sys_socketcall, sys_syslog, sys_lookup_dcookie, sys_fadvise64 /*210*/ .long sys_fadvise64_64, sys_tgkill, sys_waitpid, sys_swapoff, sys_sysinfo /*215*/ .long sys_ipc, sys_sigreturn, sys_clone, sys_ioprio_get, sys_adjtimex ---- kernel-maemo-2.6.28.test.orig/arch/sparc64/Kconfig -+++ kernel-maemo-2.6.28.test/arch/sparc64/Kconfig +--- kernel-power-2.6.28.orig/arch/sparc64/Kconfig ++++ kernel-power-2.6.28/arch/sparc64/Kconfig @@ -14,6 +14,7 @@ select HAVE_FUNCTION_TRACER select HAVE_IDE @@ -1195,8 +1195,8 @@ select HAVE_ARCH_KGDB select USE_GENERIC_SMP_HELPERS if SMP select HAVE_ARCH_TRACEHOOK ---- kernel-maemo-2.6.28.test.orig/arch/sparc64/kernel/chmc.c -+++ kernel-maemo-2.6.28.test/arch/sparc64/kernel/chmc.c +--- kernel-power-2.6.28.orig/arch/sparc64/kernel/chmc.c ++++ kernel-power-2.6.28/arch/sparc64/kernel/chmc.c @@ -306,6 +306,7 @@ buf[1] = '?'; buf[2] = '?'; @@ -1205,8 +1205,8 @@ } p = dp->controller; prop = &p->layout; ---- kernel-maemo-2.6.28.test.orig/arch/sparc64/kernel/sys_sparc.c -+++ kernel-maemo-2.6.28.test/arch/sparc64/kernel/sys_sparc.c +--- kernel-power-2.6.28.orig/arch/sparc64/kernel/sys_sparc.c ++++ kernel-power-2.6.28/arch/sparc64/kernel/sys_sparc.c @@ -397,7 +397,7 @@ } } @@ -1339,8 +1339,8 @@ { int err = 0; ---- kernel-maemo-2.6.28.test.orig/arch/sparc64/kernel/syscalls.S -+++ kernel-maemo-2.6.28.test/arch/sparc64/kernel/syscalls.S +--- kernel-power-2.6.28.orig/arch/sparc64/kernel/syscalls.S ++++ kernel-power-2.6.28/arch/sparc64/kernel/syscalls.S @@ -20,8 +20,8 @@ add %sp, PTREGS_OFF, %o0 @@ -1352,8 +1352,8 @@ add %sp, PTREGS_OFF, %o0 sys_nis_syscall: ba,pt %xcc, c_sys_nis_syscall ---- kernel-maemo-2.6.28.test.orig/arch/sparc64/kernel/systbls.S -+++ kernel-maemo-2.6.28.test/arch/sparc64/kernel/systbls.S +--- kernel-power-2.6.28.orig/arch/sparc64/kernel/systbls.S ++++ kernel-power-2.6.28/arch/sparc64/kernel/systbls.S @@ -21,12 +21,12 @@ /*0*/ .word sys_restart_syscall, sys32_exit, sys_fork, sys_read, sys_write /*5*/ .word sys32_open, sys_close, sys32_wait4, sys32_creat, sys_link @@ -1422,8 +1422,8 @@ .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy ---- kernel-maemo-2.6.28.test.orig/arch/sparc64/kernel/systbls.h -+++ kernel-maemo-2.6.28.test/arch/sparc64/kernel/systbls.h +--- kernel-power-2.6.28.orig/arch/sparc64/kernel/systbls.h ++++ kernel-power-2.6.28/arch/sparc64/kernel/systbls.h @@ -16,9 +16,6 @@ void __user *ptr, long fifth); extern asmlinkage long sparc64_newuname(struct new_utsname __user *name); @@ -1434,8 +1434,8 @@ extern asmlinkage long sys64_munmap(unsigned long addr, size_t len); extern asmlinkage unsigned long sys64_mremap(unsigned long addr, unsigned long old_len, ---- kernel-maemo-2.6.28.test.orig/arch/sparc64/kernel/traps.c -+++ kernel-maemo-2.6.28.test/arch/sparc64/kernel/traps.c +--- kernel-power-2.6.28.orig/arch/sparc64/kernel/traps.c ++++ kernel-power-2.6.28/arch/sparc64/kernel/traps.c @@ -1,6 +1,6 @@ /* arch/sparc64/kernel/traps.c * @@ -1466,8 +1466,8 @@ printk("sun4v_data_access_exception: ADDR[%016lx] " "CTX[%04x] TYPE[%04x], going.\n", addr, ctx, type); ---- kernel-maemo-2.6.28.test.orig/arch/x86/Kconfig -+++ kernel-maemo-2.6.28.test/arch/x86/Kconfig +--- kernel-power-2.6.28.orig/arch/x86/Kconfig ++++ kernel-power-2.6.28/arch/x86/Kconfig @@ -569,7 +569,7 @@ # need this always selected by IOMMU for the VIA workaround @@ -1477,8 +1477,8 @@ help Support for software bounce buffers used on x86-64 systems which don't have a hardware IOMMU (e.g. the current generation ---- kernel-maemo-2.6.28.test.orig/arch/x86/boot/memory.c -+++ kernel-maemo-2.6.28.test/arch/x86/boot/memory.c +--- kernel-power-2.6.28.orig/arch/x86/boot/memory.c ++++ kernel-power-2.6.28/arch/x86/boot/memory.c @@ -27,13 +27,14 @@ do { size = sizeof(struct e820entry); @@ -1497,8 +1497,8 @@ /* BIOSes which terminate the chain with CF = 1 as opposed to %ebx = 0 don't always report the SMAP signature on ---- kernel-maemo-2.6.28.test.orig/arch/x86/ia32/ia32entry.S -+++ kernel-maemo-2.6.28.test/arch/x86/ia32/ia32entry.S +--- kernel-power-2.6.28.orig/arch/x86/ia32/ia32entry.S ++++ kernel-power-2.6.28/arch/x86/ia32/ia32entry.S @@ -418,9 +418,9 @@ orl $TS_COMPAT,TI_status(%r10) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) @@ -1522,8 +1522,8 @@ END(ia32_syscall) ia32_badsys: ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/kvm_host.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/kvm_host.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/kvm_host.h ++++ kernel-power-2.6.28/arch/x86/include/asm/kvm_host.h @@ -190,9 +190,11 @@ u64 *spt; /* hold the gfn of each spte inside spt */ @@ -1548,8 +1548,8 @@ static inline struct kvm_mmu_page *page_header(hpa_t shadow_page) { struct page *page = pfn_to_page(shadow_page >> PAGE_SHIFT); ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/math_emu.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/math_emu.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/math_emu.h ++++ kernel-power-2.6.28/arch/x86/include/asm/math_emu.h @@ -1,31 +1,18 @@ #ifndef _ASM_X86_MATH_EMU_H #define _ASM_X86_MATH_EMU_H @@ -1590,8 +1590,8 @@ + }; }; #endif /* _ASM_X86_MATH_EMU_H */ ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/mmzone_32.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/mmzone_32.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/mmzone_32.h ++++ kernel-power-2.6.28/arch/x86/include/asm/mmzone_32.h @@ -32,8 +32,6 @@ get_memcfg_numa_flat(); } @@ -1601,8 +1601,8 @@ extern void resume_map_numa_kva(pgd_t *pgd); #else /* !CONFIG_NUMA */ ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/mmzone_64.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/mmzone_64.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/mmzone_64.h ++++ kernel-power-2.6.28/arch/x86/include/asm/mmzone_64.h @@ -40,8 +40,6 @@ #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ NODE_DATA(nid)->node_spanned_pages) @@ -1612,8 +1612,8 @@ #ifdef CONFIG_NUMA_EMU #define FAKE_NODE_MIN_SIZE (64 * 1024 * 1024) #define FAKE_NODE_MIN_HASH_MASK (~(FAKE_NODE_MIN_SIZE - 1UL)) ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/msr-index.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/msr-index.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/msr-index.h ++++ kernel-power-2.6.28/arch/x86/include/asm/msr-index.h @@ -200,6 +200,35 @@ #define MSR_IA32_THERM_STATUS 0x0000019c #define MSR_IA32_MISC_ENABLE 0x000001a0 @@ -1650,8 +1650,8 @@ /* Intel Model 6 */ #define MSR_P6_EVNTSEL0 0x00000186 #define MSR_P6_EVNTSEL1 0x00000187 ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/paravirt.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/paravirt.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/paravirt.h ++++ kernel-power-2.6.28/arch/x86/include/asm/paravirt.h @@ -1352,14 +1352,7 @@ PVOP_VCALL0(pv_cpu_ops.lazy_mode.leave); } @@ -1683,8 +1683,8 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, unsigned long phys, pgprot_t flags) ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/pgalloc.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/pgalloc.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/pgalloc.h ++++ kernel-power-2.6.28/arch/x86/include/asm/pgalloc.h @@ -42,6 +42,7 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte) @@ -1693,8 +1693,8 @@ __free_page(pte); } ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/processor.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/processor.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/processor.h ++++ kernel-power-2.6.28/arch/x86/include/asm/processor.h @@ -349,7 +349,7 @@ u8 no_update; u8 rm; @@ -1704,8 +1704,8 @@ u32 entry_eip; }; ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/seccomp_32.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/seccomp_32.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/seccomp_32.h ++++ kernel-power-2.6.28/arch/x86/include/asm/seccomp_32.h @@ -1,12 +1,6 @@ #ifndef _ASM_X86_SECCOMP_32_H #define _ASM_X86_SECCOMP_32_H @@ -1719,8 +1719,8 @@ #include #define __NR_seccomp_read __NR_read ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/seccomp_64.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/seccomp_64.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/seccomp_64.h ++++ kernel-power-2.6.28/arch/x86/include/asm/seccomp_64.h @@ -1,14 +1,6 @@ #ifndef _ASM_X86_SECCOMP_64_H #define _ASM_X86_SECCOMP_64_H @@ -1736,8 +1736,8 @@ #include #include ---- kernel-maemo-2.6.28.test.orig/arch/x86/include/asm/traps.h -+++ kernel-maemo-2.6.28.test/arch/x86/include/asm/traps.h +--- kernel-power-2.6.28.orig/arch/x86/include/asm/traps.h ++++ kernel-power-2.6.28/arch/x86/include/asm/traps.h @@ -41,7 +41,7 @@ dotraplinkage void do_overflow(struct pt_regs *, long); dotraplinkage void do_bounds(struct pt_regs *, long); @@ -1757,8 +1757,8 @@ #endif #endif /* _ASM_X86_TRAPS_H */ ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/acpi/cstate.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/acpi/cstate.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/acpi/cstate.c ++++ kernel-power-2.6.28/arch/x86/kernel/acpi/cstate.c @@ -56,6 +56,7 @@ static short mwait_supported[ACPI_PROCESSOR_MAX_POWER]; @@ -1777,8 +1777,8 @@ edx_part = edx >> (cstate_type * MWAIT_SUBSTATE_SIZE); num_cstate_subtype = edx_part & MWAIT_SUBSTATE_MASK; ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/apic.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/apic.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/apic.c ++++ kernel-power-2.6.28/arch/x86/kernel/apic.c @@ -1451,7 +1451,7 @@ switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: @@ -1788,8 +1788,8 @@ break; goto no_apic; case X86_VENDOR_INTEL: ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/cpu/addon_cpuid_features.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/cpu/addon_cpuid_features.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/cpu/addon_cpuid_features.c ++++ kernel-power-2.6.28/arch/x86/kernel/cpu/addon_cpuid_features.c @@ -120,9 +120,17 @@ c->cpu_core_id = phys_pkg_id(c->initial_apicid, ht_mask_width) & core_select_mask; @@ -1808,8 +1808,8 @@ #endif c->x86_max_cores = (core_level_siblings / smp_num_siblings); ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/cpu/intel.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/cpu/intel.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/cpu/intel.c ++++ kernel-power-2.6.28/arch/x86/kernel/cpu/intel.c @@ -30,6 +30,19 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) @@ -1852,8 +1852,8 @@ if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) { /* * let's use the legacy cpuid vector 0x1 and 0x4 for topology ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/cpu/mtrr/generic.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/cpu/mtrr/generic.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/cpu/mtrr/generic.c ++++ kernel-power-2.6.28/arch/x86/kernel/cpu/mtrr/generic.c @@ -45,6 +45,32 @@ static int mtrr_show; module_param_named(show, mtrr_show, bool, 0); @@ -1944,8 +1944,8 @@ while (fixed_range_blocks[++block].ranges) for (range=0; range < fixed_range_blocks[block].ranges; range++) set_fixed_range(fixed_range_blocks[block].base_msr + range, ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/cpu/mtrr/main.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/cpu/mtrr/main.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/cpu/mtrr/main.c ++++ kernel-power-2.6.28/arch/x86/kernel/cpu/mtrr/main.c @@ -1600,8 +1600,7 @@ /* kvm/qemu doesn't have mtrr set right, don't trim them all */ @@ -1956,8 +1956,8 @@ return 0; } ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/head64.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/head64.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/head64.c ++++ kernel-power-2.6.28/arch/x86/kernel/head64.c @@ -26,7 +26,7 @@ #include @@ -1967,8 +1967,8 @@ #ifdef CONFIG_SMP /* ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/head_64.S -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/head_64.S +--- kernel-power-2.6.28.orig/arch/x86/kernel/head_64.S ++++ kernel-power-2.6.28/arch/x86/kernel/head_64.S @@ -305,7 +305,7 @@ call dump_stack #ifdef CONFIG_KALLSYMS @@ -1978,8 +1978,8 @@ call __print_symbol #endif #endif /* EARLY_PRINTK */ ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/hpet.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/hpet.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/hpet.c ++++ kernel-power-2.6.28/arch/x86/kernel/hpet.c @@ -267,6 +267,8 @@ now = hpet_readl(HPET_COUNTER); cmp = now + (unsigned long) delta; @@ -1989,8 +1989,8 @@ cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC | HPET_TN_SETVAL | HPET_TN_32BIT; hpet_writel(cfg, HPET_Tn_CFG(timer)); ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/microcode_amd.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/microcode_amd.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/microcode_amd.c ++++ kernel-power-2.6.28/arch/x86/kernel/microcode_amd.c @@ -62,7 +62,7 @@ unsigned int mc_patch_data_checksum; unsigned int nb_dev_id; @@ -2035,8 +2035,8 @@ return 0; } ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/paravirt.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/paravirt.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/paravirt.c ++++ kernel-power-2.6.28/arch/x86/kernel/paravirt.c @@ -268,6 +268,30 @@ return __get_cpu_var(paravirt_lazy_mode); } @@ -2068,8 +2068,8 @@ struct pv_info pv_info = { .name = "bare hardware", .paravirt_enabled = 0, ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/ptrace.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/ptrace.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/ptrace.c ++++ kernel-power-2.6.28/arch/x86/kernel/ptrace.c @@ -1512,7 +1512,7 @@ #ifdef CONFIG_X86_32 # define IS_IA32 1 @@ -2079,8 +2079,8 @@ #else # define IS_IA32 0 #endif ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/reboot.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/reboot.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/reboot.c ++++ kernel-power-2.6.28/arch/x86/kernel/reboot.c @@ -202,6 +202,14 @@ DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"), }, @@ -2096,8 +2096,8 @@ { } }; ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/syscall_table_32.S -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/syscall_table_32.S +--- kernel-power-2.6.28.orig/arch/x86/kernel/syscall_table_32.S ++++ kernel-power-2.6.28/arch/x86/kernel/syscall_table_32.S @@ -88,7 +88,7 @@ .long sys_uselib .long sys_swapon @@ -2107,8 +2107,8 @@ .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/tlb_uv.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/tlb_uv.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/tlb_uv.c ++++ kernel-power-2.6.28/arch/x86/kernel/tlb_uv.c @@ -586,7 +586,6 @@ static struct bau_control * __init uv_table_bases_init(int blade, int node) { @@ -2139,8 +2139,8 @@ bcp->msg_statuses = bau_tablesp->msg_statuses; bcp->descriptor_base = adp; } ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/traps.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/traps.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/traps.c ++++ kernel-power-2.6.28/arch/x86/kernel/traps.c @@ -104,6 +104,12 @@ local_irq_enable(); } @@ -2200,8 +2200,8 @@ } #else math_state_restore(); ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/vmi_32.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/vmi_32.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/vmi_32.c ++++ kernel-power-2.6.28/arch/x86/kernel/vmi_32.c @@ -430,6 +430,16 @@ } @@ -2227,8 +2227,8 @@ } /* Set linear is needed in all cases */ ---- kernel-maemo-2.6.28.test.orig/arch/x86/kernel/vmiclock_32.c -+++ kernel-maemo-2.6.28.test/arch/x86/kernel/vmiclock_32.c +--- kernel-power-2.6.28.orig/arch/x86/kernel/vmiclock_32.c ++++ kernel-power-2.6.28/arch/x86/kernel/vmiclock_32.c @@ -283,10 +283,13 @@ #endif @@ -2244,8 +2244,8 @@ } static struct clocksource clocksource_vmi = { ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/i8254.c -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/i8254.c +--- kernel-power-2.6.28.orig/arch/x86/kvm/i8254.c ++++ kernel-power-2.6.28/arch/x86/kvm/i8254.c @@ -207,7 +207,7 @@ hrtimer_add_expires_ns(&pt->timer, pt->period); pt->scheduled = hrtimer_get_expires_ns(&pt->timer); @@ -2255,8 +2255,8 @@ return (pt->period == 0 ? 0 : 1); } ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/irq.c -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/irq.c +--- kernel-power-2.6.28.orig/arch/x86/kvm/irq.c ++++ kernel-power-2.6.28/arch/x86/kvm/irq.c @@ -87,13 +87,6 @@ } EXPORT_SYMBOL_GPL(kvm_inject_pending_timer_irqs); @@ -2271,8 +2271,8 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu) { __kvm_migrate_apic_timer(vcpu); ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/irq.h -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/irq.h +--- kernel-power-2.6.28.orig/arch/x86/kvm/irq.h ++++ kernel-power-2.6.28/arch/x86/kvm/irq.h @@ -84,7 +84,6 @@ void kvm_pic_reset(struct kvm_kpic_state *s); @@ -2281,8 +2281,8 @@ void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/lapic.c -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/lapic.c +--- kernel-power-2.6.28.orig/arch/x86/kvm/lapic.c ++++ kernel-power-2.6.28/arch/x86/kvm/lapic.c @@ -35,6 +35,12 @@ #include "kvm_cache_regs.h" #include "irq.h" @@ -2384,8 +2384,8 @@ int kvm_get_apic_interrupt(struct kvm_vcpu *vcpu) { int vector = kvm_apic_has_interrupt(vcpu); ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/lapic.h -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/lapic.h +--- kernel-power-2.6.28.orig/arch/x86/kvm/lapic.h ++++ kernel-power-2.6.28/arch/x86/kvm/lapic.h @@ -12,7 +12,6 @@ atomic_t pending; s64 period; /* unit: ns */ @@ -2402,8 +2402,8 @@ void kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t vapic_addr); void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu); ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/mmu.c -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/mmu.c +--- kernel-power-2.6.28.orig/arch/x86/kvm/mmu.c ++++ kernel-power-2.6.28/arch/x86/kvm/mmu.c @@ -384,7 +384,9 @@ { int *write_count; @@ -2493,8 +2493,8 @@ rmapp = &slot->rmap[gfn - slot->base_gfn]; if (*rmapp) printk(KERN_ERR "%s: (%s) shadow page has writable" ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/paging_tmpl.h -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/paging_tmpl.h +--- kernel-power-2.6.28.orig/arch/x86/kvm/paging_tmpl.h ++++ kernel-power-2.6.28/arch/x86/kvm/paging_tmpl.h @@ -467,9 +467,13 @@ u64 *sptep, int level) { @@ -2511,8 +2511,8 @@ set_shadow_pte(sptep, shadow_trap_nonpresent_pte); return 1; } ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/svm.c -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/svm.c +--- kernel-power-2.6.28.orig/arch/x86/kvm/svm.c ++++ kernel-power-2.6.28/arch/x86/kvm/svm.c @@ -772,6 +772,22 @@ var->l = (s->attrib >> SVM_SELECTOR_L_SHIFT) & 1; var->db = (s->attrib >> SVM_SELECTOR_DB_SHIFT) & 1; @@ -2544,8 +2544,8 @@ out: update_cr8_intercept(vcpu); } ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/vmx.c -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/vmx.c +--- kernel-power-2.6.28.orig/arch/x86/kvm/vmx.c ++++ kernel-power-2.6.28/arch/x86/kvm/vmx.c @@ -897,6 +897,7 @@ data = vmcs_readl(GUEST_SYSENTER_ESP); break; @@ -2575,8 +2575,8 @@ } /* ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/vmx.h -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/vmx.h +--- kernel-power-2.6.28.orig/arch/x86/kvm/vmx.h ++++ kernel-power-2.6.28/arch/x86/kvm/vmx.h @@ -331,8 +331,9 @@ #define AR_RESERVD_MASK 0xfffe0f00 @@ -2589,8 +2589,8 @@ #define VMX_NR_VPIDS (1 << 16) #define VMX_VPID_EXTENT_SINGLE_CONTEXT 1 ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/x86.c -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/x86.c +--- kernel-power-2.6.28.orig/arch/x86/kvm/x86.c ++++ kernel-power-2.6.28/arch/x86/kvm/x86.c @@ -906,7 +906,6 @@ case KVM_CAP_USER_MEMORY: case KVM_CAP_SET_TSS_ADDR: @@ -2654,8 +2654,8 @@ return kvm_x86_ops->vcpu_reset(vcpu); } ---- kernel-maemo-2.6.28.test.orig/arch/x86/kvm/x86_emulate.c -+++ kernel-maemo-2.6.28.test/arch/x86/kvm/x86_emulate.c +--- kernel-power-2.6.28.orig/arch/x86/kvm/x86_emulate.c ++++ kernel-power-2.6.28/arch/x86/kvm/x86_emulate.c @@ -299,7 +299,7 @@ static u16 group2_table[] = { @@ -2665,8 +2665,8 @@ SrcNone | ModRM | DstMem | Mov, 0, SrcMem16 | ModRM | Mov, 0, }; ---- kernel-maemo-2.6.28.test.orig/arch/x86/lib/usercopy_32.c -+++ kernel-maemo-2.6.28.test/arch/x86/lib/usercopy_32.c +--- kernel-power-2.6.28.orig/arch/x86/lib/usercopy_32.c ++++ kernel-power-2.6.28/arch/x86/lib/usercopy_32.c @@ -56,7 +56,7 @@ " jmp 2b\n" \ ".previous\n" \ @@ -2685,8 +2685,8 @@ :"0" (n), "1" (s), "2" (0), "3" (mask) :"cc"); return res & mask; ---- kernel-maemo-2.6.28.test.orig/arch/x86/lib/usercopy_64.c -+++ kernel-maemo-2.6.28.test/arch/x86/lib/usercopy_64.c +--- kernel-power-2.6.28.orig/arch/x86/lib/usercopy_64.c ++++ kernel-power-2.6.28/arch/x86/lib/usercopy_64.c @@ -32,7 +32,7 @@ " jmp 2b\n" \ ".previous\n" \ @@ -2705,8 +2705,8 @@ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr), [zero] "r" (0UL), [eight] "r" (8UL)); return size; ---- kernel-maemo-2.6.28.test.orig/arch/x86/math-emu/fpu_entry.c -+++ kernel-maemo-2.6.28.test/arch/x86/math-emu/fpu_entry.c +--- kernel-power-2.6.28.orig/arch/x86/math-emu/fpu_entry.c ++++ kernel-power-2.6.28/arch/x86/math-emu/fpu_entry.c @@ -131,7 +131,7 @@ static int valid_prefix(u_char *Byte, u_char __user ** fpu_eip, overrides * override); @@ -2734,8 +2734,8 @@ { FPU_EIP = FPU_ORIG_EIP; current->thread.trap_no = 16; ---- kernel-maemo-2.6.28.test.orig/arch/x86/math-emu/fpu_proto.h -+++ kernel-maemo-2.6.28.test/arch/x86/math-emu/fpu_proto.h +--- kernel-power-2.6.28.orig/arch/x86/math-emu/fpu_proto.h ++++ kernel-power-2.6.28/arch/x86/math-emu/fpu_proto.h @@ -51,8 +51,8 @@ extern void fst_i_(void); extern void fstp_i(void); @@ -2747,8 +2747,8 @@ /* fpu_etc.c */ extern void FPU_etc(void); /* fpu_tags.c */ ---- kernel-maemo-2.6.28.test.orig/arch/x86/math-emu/fpu_system.h -+++ kernel-maemo-2.6.28.test/arch/x86/math-emu/fpu_system.h +--- kernel-power-2.6.28.orig/arch/x86/math-emu/fpu_system.h ++++ kernel-power-2.6.28/arch/x86/math-emu/fpu_system.h @@ -16,10 +16,6 @@ #include #include @@ -2779,8 +2779,8 @@ #define FPU_ORIG_EIP (FPU_info->___orig_eip) #define FPU_lookahead (I387->soft.lookahead) ---- kernel-maemo-2.6.28.test.orig/arch/x86/math-emu/get_address.c -+++ kernel-maemo-2.6.28.test/arch/x86/math-emu/get_address.c +--- kernel-power-2.6.28.orig/arch/x86/math-emu/get_address.c ++++ kernel-power-2.6.28/arch/x86/math-emu/get_address.c @@ -29,46 +29,43 @@ #define FPU_WRITE_BIT 0x10 @@ -2896,8 +2896,8 @@ break; } ---- kernel-maemo-2.6.28.test.orig/arch/x86/mm/fault.c -+++ kernel-maemo-2.6.28.test/arch/x86/mm/fault.c +--- kernel-power-2.6.28.orig/arch/x86/mm/fault.c ++++ kernel-power-2.6.28/arch/x86/mm/fault.c @@ -533,7 +533,7 @@ happen within a race in page table update. In the later case just flush. */ @@ -2936,8 +2936,8 @@ /* * It's safe to allow irq's after cr2 has been saved and the ---- kernel-maemo-2.6.28.test.orig/arch/x86/mm/numa_64.c -+++ kernel-maemo-2.6.28.test/arch/x86/mm/numa_64.c +--- kernel-power-2.6.28.orig/arch/x86/mm/numa_64.c ++++ kernel-power-2.6.28/arch/x86/mm/numa_64.c @@ -145,7 +145,7 @@ return shift; } @@ -2947,8 +2947,8 @@ { return phys_to_nid(pfn << PAGE_SHIFT); } ---- kernel-maemo-2.6.28.test.orig/arch/x86/mm/pageattr.c -+++ kernel-maemo-2.6.28.test/arch/x86/mm/pageattr.c +--- kernel-power-2.6.28.orig/arch/x86/mm/pageattr.c ++++ kernel-power-2.6.28/arch/x86/mm/pageattr.c @@ -534,6 +534,36 @@ return 0; } @@ -3045,8 +3045,8 @@ out: return ret; } ---- kernel-maemo-2.6.28.test.orig/arch/x86/mm/pat.c -+++ kernel-maemo-2.6.28.test/arch/x86/mm/pat.c +--- kernel-power-2.6.28.orig/arch/x86/mm/pat.c ++++ kernel-power-2.6.28/arch/x86/mm/pat.c @@ -333,11 +333,23 @@ req_type & _PAGE_CACHE_MASK); } @@ -3111,8 +3111,8 @@ spin_lock(&memtype_lock); list_for_each_entry(entry, &memtype_list, nd) { ---- kernel-maemo-2.6.28.test.orig/arch/x86/oprofile/op_model_ppro.c -+++ kernel-maemo-2.6.28.test/arch/x86/oprofile/op_model_ppro.c +--- kernel-power-2.6.28.orig/arch/x86/oprofile/op_model_ppro.c ++++ kernel-power-2.6.28/arch/x86/oprofile/op_model_ppro.c @@ -78,8 +78,18 @@ if (cpu_has_arch_perfmon) { union cpuid10_eax eax; @@ -3134,8 +3134,8 @@ } /* clear all counters */ ---- kernel-maemo-2.6.28.test.orig/arch/x86/pci/i386.c -+++ kernel-maemo-2.6.28.test/arch/x86/pci/i386.c +--- kernel-power-2.6.28.orig/arch/x86/pci/i386.c ++++ kernel-power-2.6.28/arch/x86/pci/i386.c @@ -329,6 +329,9 @@ return -EINVAL; } @@ -3146,8 +3146,8 @@ } if (((vma->vm_pgoff < max_low_pfn_mapped) || ---- kernel-maemo-2.6.28.test.orig/arch/x86/pci/irq.c -+++ kernel-maemo-2.6.28.test/arch/x86/pci/irq.c +--- kernel-power-2.6.28.orig/arch/x86/pci/irq.c ++++ kernel-power-2.6.28/arch/x86/pci/irq.c @@ -573,6 +573,7 @@ case PCI_DEVICE_ID_INTEL_ICH7_1: case PCI_DEVICE_ID_INTEL_ICH7_30: @@ -3156,8 +3156,8 @@ case PCI_DEVICE_ID_INTEL_ESB2_0: case PCI_DEVICE_ID_INTEL_ICH8_0: case PCI_DEVICE_ID_INTEL_ICH8_1: ---- kernel-maemo-2.6.28.test.orig/arch/x86/xen/enlighten.c -+++ kernel-maemo-2.6.28.test/arch/x86/xen/enlighten.c +--- kernel-power-2.6.28.orig/arch/x86/xen/enlighten.c ++++ kernel-power-2.6.28/arch/x86/xen/enlighten.c @@ -1669,6 +1669,9 @@ possible map and a non-dummy shared_info. */ per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; @@ -3168,8 +3168,8 @@ xen_raw_console_write("mapping kernel into physical memory\n"); pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages); ---- kernel-maemo-2.6.28.test.orig/block/genhd.c -+++ kernel-maemo-2.6.28.test/block/genhd.c +--- kernel-power-2.6.28.orig/block/genhd.c ++++ kernel-power-2.6.28/block/genhd.c @@ -98,7 +98,7 @@ if (flags & DISK_PITER_REVERSE) @@ -3210,8 +3210,8 @@ while ((hd = disk_part_iter_next(&piter))) { cpu = part_stat_lock(); part_round_stats(cpu, hd); ---- kernel-maemo-2.6.28.test.orig/crypto/algapi.c -+++ kernel-maemo-2.6.28.test/crypto/algapi.c +--- kernel-power-2.6.28.orig/crypto/algapi.c ++++ kernel-power-2.6.28/crypto/algapi.c @@ -149,6 +149,9 @@ if (q == alg) goto err; @@ -3239,8 +3239,8 @@ alg = test->adult; if (err || list_empty(&alg->cra_list)) goto complete; ---- kernel-maemo-2.6.28.test.orig/crypto/async_tx/async_tx.c -+++ kernel-maemo-2.6.28.test/crypto/async_tx/async_tx.c +--- kernel-power-2.6.28.orig/crypto/async_tx/async_tx.c ++++ kernel-power-2.6.28/crypto/async_tx/async_tx.c @@ -124,6 +124,8 @@ if (!dep) return; @@ -3250,8 +3250,8 @@ chan = dep->chan; /* keep submitting up until a channel switch is detected ---- kernel-maemo-2.6.28.test.orig/crypto/authenc.c -+++ kernel-maemo-2.6.28.test/crypto/authenc.c +--- kernel-power-2.6.28.orig/crypto/authenc.c ++++ kernel-power-2.6.28/crypto/authenc.c @@ -157,16 +157,19 @@ dstp = sg_page(dst); vdst = PageHighMem(dstp) ? NULL : page_address(dstp) + dst->offset; @@ -3296,8 +3296,8 @@ } static int crypto_authenc_decrypt(struct aead_request *req) ---- kernel-maemo-2.6.28.test.orig/crypto/ccm.c -+++ kernel-maemo-2.6.28.test/crypto/ccm.c +--- kernel-power-2.6.28.orig/crypto/ccm.c ++++ kernel-power-2.6.28/crypto/ccm.c @@ -266,6 +266,8 @@ if (assoclen) { pctx->ilen = format_adata(idata, assoclen); @@ -3307,8 +3307,8 @@ } /* compute plaintext into mac */ ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/asus_acpi.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/asus_acpi.c +--- kernel-power-2.6.28.orig/drivers/acpi/asus_acpi.c ++++ kernel-power-2.6.28/drivers/acpi/asus_acpi.c @@ -143,6 +143,7 @@ S1300N, S5200N*/ A4S, /* Z81sp */ @@ -3346,8 +3346,8 @@ else if (strncmp(model, "A4S", 3) == 0) return A4S; else if (strncmp(model, "F3Sa", 4) == 0) ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/battery.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/battery.c +--- kernel-power-2.6.28.orig/drivers/acpi/battery.c ++++ kernel-power-2.6.28/drivers/acpi/battery.c @@ -471,7 +471,7 @@ static int acpi_battery_update(struct acpi_battery *battery) @@ -3367,8 +3367,8 @@ result = acpi_battery_get_info(battery); if (result) return result; ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/dock.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/dock.c +--- kernel-power-2.6.28.orig/drivers/acpi/dock.c ++++ kernel-power-2.6.28/drivers/acpi/dock.c @@ -855,10 +855,14 @@ static ssize_t show_docked(struct device *dev, struct device_attribute *attr, char *buf) @@ -3397,8 +3397,8 @@ dock_remove(dock_station); } ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/ec.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/ec.c +--- kernel-power-2.6.28.orig/drivers/acpi/ec.c ++++ kernel-power-2.6.28/drivers/acpi/ec.c @@ -759,9 +759,10 @@ struct acpi_namespace_node *node = handle; struct acpi_ec *ec = context; @@ -3412,8 +3412,8 @@ return AE_OK; } ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/namespace/nsutils.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/namespace/nsutils.c +--- kernel-power-2.6.28.orig/drivers/acpi/namespace/nsutils.c ++++ kernel-power-2.6.28/drivers/acpi/namespace/nsutils.c @@ -314,9 +314,15 @@ * * strlen() + 1 covers the first name_seg, which has no path separator @@ -3431,8 +3431,8 @@ } else { /* * Handle Carat prefixes ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/pci_link.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/pci_link.c +--- kernel-power-2.6.28.orig/drivers/acpi/pci_link.c ++++ kernel-power-2.6.28/drivers/acpi/pci_link.c @@ -796,10 +796,6 @@ struct list_head *node = NULL; struct acpi_pci_link *link = NULL; @@ -3444,8 +3444,8 @@ list_for_each(node, &acpi_link.entries) { link = list_entry(node, struct acpi_pci_link, node); if (!link) { ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/power.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/power.c +--- kernel-power-2.6.28.orig/drivers/acpi/power.c ++++ kernel-power-2.6.28/drivers/acpi/power.c @@ -151,7 +151,7 @@ *state = (sta & 0x01)?ACPI_POWER_RESOURCE_STATE_ON: ACPI_POWER_RESOURCE_STATE_OFF; @@ -3455,8 +3455,8 @@ acpi_ut_get_node_name(handle), *state ? "on" : "off")); ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/tables.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/tables.c +--- kernel-power-2.6.28.orig/drivers/acpi/tables.c ++++ kernel-power-2.6.28/drivers/acpi/tables.c @@ -293,7 +293,12 @@ int __init acpi_table_init(void) @@ -3471,8 +3471,8 @@ check_multiple_madt(); return 0; } ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/tables/tbutils.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/tables/tbutils.c +--- kernel-power-2.6.28.orig/drivers/acpi/tables/tbutils.c ++++ kernel-power-2.6.28/drivers/acpi/tables/tbutils.c @@ -512,10 +512,9 @@ if (ACPI_FAILURE(status)) { ACPI_WARNING((AE_INFO, @@ -3487,8 +3487,8 @@ break; } } ---- kernel-maemo-2.6.28.test.orig/drivers/acpi/video.c -+++ kernel-maemo-2.6.28.test/drivers/acpi/video.c +--- kernel-power-2.6.28.orig/drivers/acpi/video.c ++++ kernel-power-2.6.28/drivers/acpi/video.c @@ -36,6 +36,7 @@ #include #include @@ -3593,8 +3593,8 @@ video->device = device; strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME); ---- kernel-maemo-2.6.28.test.orig/drivers/ata/ata_piix.c -+++ kernel-maemo-2.6.28.test/drivers/ata/ata_piix.c +--- kernel-power-2.6.28.orig/drivers/ata/ata_piix.c ++++ kernel-power-2.6.28/drivers/ata/ata_piix.c @@ -1294,6 +1294,39 @@ return map; } @@ -3646,8 +3646,8 @@ if (!(host->ports[0]->flags & PIIX_FLAG_SIDPR)) return 0; ---- kernel-maemo-2.6.28.test.orig/drivers/ata/libata-core.c -+++ kernel-maemo-2.6.28.test/drivers/ata/libata-core.c +--- kernel-power-2.6.28.orig/drivers/ata/libata-core.c ++++ kernel-power-2.6.28/drivers/ata/libata-core.c @@ -1251,14 +1251,16 @@ { if (ata_id_has_lba(id)) { @@ -3669,8 +3669,8 @@ } } ---- kernel-maemo-2.6.28.test.orig/drivers/ata/libata-eh.c -+++ kernel-maemo-2.6.28.test/drivers/ata/libata-eh.c +--- kernel-power-2.6.28.orig/drivers/ata/libata-eh.c ++++ kernel-power-2.6.28/drivers/ata/libata-eh.c @@ -2366,11 +2366,14 @@ } @@ -3703,8 +3703,8 @@ } } ---- kernel-maemo-2.6.28.test.orig/drivers/ata/pata_hpt37x.c -+++ kernel-maemo-2.6.28.test/drivers/ata/pata_hpt37x.c +--- kernel-power-2.6.28.orig/drivers/ata/pata_hpt37x.c ++++ kernel-power-2.6.28/drivers/ata/pata_hpt37x.c @@ -8,7 +8,7 @@ * Copyright (C) 1999-2003 Andre Hedrick * Portions Copyright (C) 2001 Sun Microsystems, Inc. @@ -3755,8 +3755,8 @@ .bmdma_stop = hpt370_bmdma_stop, .mode_filter = hpt370_filter, ---- kernel-maemo-2.6.28.test.orig/drivers/ata/pata_via.c -+++ kernel-maemo-2.6.28.test/drivers/ata/pata_via.c +--- kernel-power-2.6.28.orig/drivers/ata/pata_via.c ++++ kernel-power-2.6.28/drivers/ata/pata_via.c @@ -86,6 +86,10 @@ VIA_SATA_PATA = 0x800, /* SATA/PATA combined configuration */ }; @@ -3844,8 +3844,8 @@ { }, }; ---- kernel-maemo-2.6.28.test.orig/drivers/ata/sata_mv.c -+++ kernel-maemo-2.6.28.test/drivers/ata/sata_mv.c +--- kernel-power-2.6.28.orig/drivers/ata/sata_mv.c ++++ kernel-power-2.6.28/drivers/ata/sata_mv.c @@ -669,8 +669,8 @@ { PCI_VDEVICE(MARVELL, 0x5081), chip_508x }, /* RocketRAID 1720/174x have different identifiers */ @@ -3866,8 +3866,8 @@ u32 hc_irq_cause, ipending; /* clear EDMA event indicators, if any */ ---- kernel-maemo-2.6.28.test.orig/drivers/ata/sata_nv.c -+++ kernel-maemo-2.6.28.test/drivers/ata/sata_nv.c +--- kernel-power-2.6.28.orig/drivers/ata/sata_nv.c ++++ kernel-power-2.6.28/drivers/ata/sata_nv.c @@ -305,10 +305,10 @@ static int nv_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val); static int nv_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val); @@ -4036,8 +4036,8 @@ } ppi[0] = &nv_port_info[type]; ---- kernel-maemo-2.6.28.test.orig/drivers/ata/sata_via.c -+++ kernel-maemo-2.6.28.test/drivers/ata/sata_via.c +--- kernel-power-2.6.28.orig/drivers/ata/sata_via.c ++++ kernel-power-2.6.28/drivers/ata/sata_via.c @@ -92,6 +92,8 @@ { PCI_VDEVICE(VIA, 0x5372), vt6420 }, { PCI_VDEVICE(VIA, 0x7372), vt6420 }, @@ -4047,8 +4047,8 @@ { } /* terminate list */ }; ---- kernel-maemo-2.6.28.test.orig/drivers/atm/fore200e.c -+++ kernel-maemo-2.6.28.test/drivers/atm/fore200e.c +--- kernel-power-2.6.28.orig/drivers/atm/fore200e.c ++++ kernel-power-2.6.28/drivers/atm/fore200e.c @@ -2519,8 +2519,8 @@ return err; @@ -4060,8 +4060,8 @@ return err; } ---- kernel-maemo-2.6.28.test.orig/drivers/block/aoe/aoe.h -+++ kernel-maemo-2.6.28.test/drivers/block/aoe/aoe.h +--- kernel-power-2.6.28.orig/drivers/block/aoe/aoe.h ++++ kernel-power-2.6.28/drivers/block/aoe/aoe.h @@ -18,6 +18,7 @@ enum { AOECMD_ATA, @@ -4070,8 +4070,8 @@ AOEFL_RSP = (1<<3), AOEFL_ERR = (1<<2), ---- kernel-maemo-2.6.28.test.orig/drivers/block/aoe/aoenet.c -+++ kernel-maemo-2.6.28.test/drivers/block/aoe/aoenet.c +--- kernel-power-2.6.28.orig/drivers/block/aoe/aoenet.c ++++ kernel-power-2.6.28/drivers/block/aoe/aoenet.c @@ -153,6 +153,8 @@ aoecmd_cfg_rsp(skb); break; @@ -4081,8 +4081,8 @@ printk(KERN_INFO "aoe: unknown cmd %d\n", h->cmd); } exit: ---- kernel-maemo-2.6.28.test.orig/drivers/block/nbd.c -+++ kernel-maemo-2.6.28.test/drivers/block/nbd.c +--- kernel-power-2.6.28.orig/drivers/block/nbd.c ++++ kernel-power-2.6.28/drivers/block/nbd.c @@ -406,6 +406,7 @@ ret = sysfs_create_file(&disk_to_dev(lo->disk)->kobj, &pid_attr.attr); if (ret) { @@ -4124,8 +4124,8 @@ if (!lo->file) return -EINVAL; thread = kthread_create(nbd_thread, lo, lo->disk->disk_name); ---- kernel-maemo-2.6.28.test.orig/drivers/block/xen-blkfront.c -+++ kernel-maemo-2.6.28.test/drivers/block/xen-blkfront.c +--- kernel-power-2.6.28.orig/drivers/block/xen-blkfront.c ++++ kernel-power-2.6.28/drivers/block/xen-blkfront.c @@ -40,6 +40,7 @@ #include #include @@ -4205,8 +4205,8 @@ err = xenbus_grant_ring(dev, virt_to_mfn(info->ring.sring)); if (err < 0) { free_page((unsigned long)sring); ---- kernel-maemo-2.6.28.test.orig/drivers/bluetooth/btsdio.c -+++ kernel-maemo-2.6.28.test/drivers/bluetooth/btsdio.c +--- kernel-power-2.6.28.orig/drivers/bluetooth/btsdio.c ++++ kernel-power-2.6.28/drivers/bluetooth/btsdio.c @@ -86,6 +86,7 @@ err = sdio_writesb(data->func, REG_TDAT, skb->data, skb->len); @@ -4215,8 +4215,8 @@ sdio_writeb(data->func, 0x01, REG_PC_WRT, NULL); return err; } ---- kernel-maemo-2.6.28.test.orig/drivers/char/agp/generic.c -+++ kernel-maemo-2.6.28.test/drivers/char/agp/generic.c +--- kernel-power-2.6.28.orig/drivers/char/agp/generic.c ++++ kernel-power-2.6.28/drivers/char/agp/generic.c @@ -1226,7 +1226,7 @@ int i, ret = -ENOMEM; @@ -4235,8 +4235,8 @@ if (page == NULL) return NULL; ---- kernel-maemo-2.6.28.test.orig/drivers/char/agp/intel-agp.c -+++ kernel-maemo-2.6.28.test/drivers/char/agp/intel-agp.c +--- kernel-power-2.6.28.orig/drivers/char/agp/intel-agp.c ++++ kernel-power-2.6.28/drivers/char/agp/intel-agp.c @@ -40,6 +40,8 @@ #define PCI_DEVICE_ID_INTEL_Q45_IG 0x2E12 #define PCI_DEVICE_ID_INTEL_G45_HB 0x2E20 @@ -4308,8 +4308,8 @@ { } }; ---- kernel-maemo-2.6.28.test.orig/drivers/char/raw.c -+++ kernel-maemo-2.6.28.test/drivers/char/raw.c +--- kernel-power-2.6.28.orig/drivers/char/raw.c ++++ kernel-power-2.6.28/drivers/char/raw.c @@ -90,6 +90,7 @@ blkdev_put(bdev, filp->f_mode); out: @@ -4318,8 +4318,8 @@ return err; } ---- kernel-maemo-2.6.28.test.orig/drivers/char/selection.c -+++ kernel-maemo-2.6.28.test/drivers/char/selection.c +--- kernel-power-2.6.28.orig/drivers/char/selection.c ++++ kernel-power-2.6.28/drivers/char/selection.c @@ -268,7 +268,7 @@ /* Allocate a new buffer before freeing the old one ... */ @@ -4329,8 +4329,8 @@ if (!bp) { printk(KERN_WARNING "selection: kmalloc() failed\n"); clear_selection(); ---- kernel-maemo-2.6.28.test.orig/drivers/cpuidle/governors/menu.c -+++ kernel-maemo-2.6.28.test/drivers/cpuidle/governors/menu.c +--- kernel-power-2.6.28.orig/drivers/cpuidle/governors/menu.c ++++ kernel-power-2.6.28/drivers/cpuidle/governors/menu.c @@ -16,12 +16,14 @@ #include @@ -4368,8 +4368,8 @@ if (last_idle_us + BREAK_FUZZ < data->expected_us - target->exit_latency) { ---- kernel-maemo-2.6.28.test.orig/drivers/crypto/ixp4xx_crypto.c -+++ kernel-maemo-2.6.28.test/drivers/crypto/ixp4xx_crypto.c +--- kernel-power-2.6.28.orig/drivers/crypto/ixp4xx_crypto.c ++++ kernel-power-2.6.28/drivers/crypto/ixp4xx_crypto.c @@ -101,6 +101,7 @@ u32 phys_addr; u32 __reserved[4]; @@ -4736,8 +4736,8 @@ } static int aead_setup(struct crypto_aead *tfm, unsigned int authsize) ---- kernel-maemo-2.6.28.test.orig/drivers/dma/ioat_dma.c -+++ kernel-maemo-2.6.28.test/drivers/dma/ioat_dma.c +--- kernel-power-2.6.28.orig/drivers/dma/ioat_dma.c ++++ kernel-power-2.6.28/drivers/dma/ioat_dma.c @@ -1341,12 +1341,11 @@ */ #define IOAT_TEST_SIZE 2000 @@ -4782,8 +4782,8 @@ if (device->common.device_is_tx_complete(dma_chan, cookie, NULL, NULL) != DMA_SUCCESS) { ---- kernel-maemo-2.6.28.test.orig/drivers/firewire/fw-ohci.c -+++ kernel-maemo-2.6.28.test/drivers/firewire/fw-ohci.c +--- kernel-power-2.6.28.orig/drivers/firewire/fw-ohci.c ++++ kernel-power-2.6.28/drivers/firewire/fw-ohci.c @@ -226,7 +226,7 @@ #define CONTEXT_DEAD 0x0800 #define CONTEXT_ACTIVE 0x0400 @@ -4793,8 +4793,8 @@ #define OHCI1394_MAX_AT_RESP_RETRIES 0x2 #define OHCI1394_MAX_PHYS_RESP_RETRIES 0x8 ---- kernel-maemo-2.6.28.test.orig/drivers/firewire/fw-sbp2.c -+++ kernel-maemo-2.6.28.test/drivers/firewire/fw-sbp2.c +--- kernel-power-2.6.28.orig/drivers/firewire/fw-sbp2.c ++++ kernel-power-2.6.28/drivers/firewire/fw-sbp2.c @@ -357,15 +357,17 @@ .model = ~0, .workarounds = SBP2_WORKAROUND_128K_MAX_TRANS, @@ -4869,8 +4869,8 @@ sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, generation, lu->command_block_agent_address + SBP2_ORB_POINTER); ---- kernel-maemo-2.6.28.test.orig/drivers/firmware/dell_rbu.c -+++ kernel-maemo-2.6.28.test/drivers/firmware/dell_rbu.c +--- kernel-power-2.6.28.orig/drivers/firmware/dell_rbu.c ++++ kernel-power-2.6.28/drivers/firmware/dell_rbu.c @@ -576,7 +576,7 @@ { int size = 0; @@ -4889,8 +4889,8 @@ spin_unlock(&rbu_data.lock); } return size; ---- kernel-maemo-2.6.28.test.orig/drivers/gpu/drm/drm_agpsupport.c -+++ kernel-maemo-2.6.28.test/drivers/gpu/drm/drm_agpsupport.c +--- kernel-power-2.6.28.orig/drivers/gpu/drm/drm_agpsupport.c ++++ kernel-power-2.6.28/drivers/gpu/drm/drm_agpsupport.c @@ -33,10 +33,11 @@ #include "drmP.h" @@ -4904,8 +4904,8 @@ /** * Get AGP information. * ---- kernel-maemo-2.6.28.test.orig/drivers/gpu/drm/drm_irq.c -+++ kernel-maemo-2.6.28.test/drivers/gpu/drm/drm_irq.c +--- kernel-power-2.6.28.orig/drivers/gpu/drm/drm_irq.c ++++ kernel-power-2.6.28/drivers/gpu/drm/drm_irq.c @@ -259,7 +259,8 @@ */ int drm_irq_uninstall(struct drm_device * dev) @@ -4945,8 +4945,8 @@ if (ret != -EINTR) { struct timeval now; ---- kernel-maemo-2.6.28.test.orig/drivers/gpu/drm/i915/i915_gem.c -+++ kernel-maemo-2.6.28.test/drivers/gpu/drm/i915/i915_gem.c +--- kernel-power-2.6.28.orig/drivers/gpu/drm/i915/i915_gem.c ++++ kernel-power-2.6.28/drivers/gpu/drm/i915/i915_gem.c @@ -1161,6 +1161,8 @@ struct drm_mm_node *free_space; int page_count, ret; @@ -5010,8 +5010,8 @@ mutex_unlock(&dev->struct_mutex); drm_irq_install(dev); ---- kernel-maemo-2.6.28.test.orig/drivers/gpu/drm/i915/i915_irq.c -+++ kernel-maemo-2.6.28.test/drivers/gpu/drm/i915/i915_irq.c +--- kernel-power-2.6.28.orig/drivers/gpu/drm/i915/i915_irq.c ++++ kernel-power-2.6.28/drivers/gpu/drm/i915/i915_irq.c @@ -400,6 +400,12 @@ { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -5025,8 +5025,8 @@ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); if (IS_I965G(dev)) ---- kernel-maemo-2.6.28.test.orig/drivers/hid/hid-core.c -+++ kernel-maemo-2.6.28.test/drivers/hid/hid-core.c +--- kernel-power-2.6.28.orig/drivers/hid/hid-core.c ++++ kernel-power-2.6.28/drivers/hid/hid-core.c @@ -1302,6 +1302,12 @@ { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, @@ -5060,8 +5060,8 @@ { } }; ---- kernel-maemo-2.6.28.test.orig/drivers/hid/hid-microsoft.c -+++ kernel-maemo-2.6.28.test/drivers/hid/hid-microsoft.c +--- kernel-power-2.6.28.orig/drivers/hid/hid-microsoft.c ++++ kernel-power-2.6.28/drivers/hid/hid-microsoft.c @@ -30,7 +30,7 @@ #define MS_NOGET 0x10 @@ -5092,8 +5092,8 @@ } } ---- kernel-maemo-2.6.28.test.orig/drivers/hid/hid-sony.c -+++ kernel-maemo-2.6.28.test/drivers/hid/hid-sony.c +--- kernel-power-2.6.28.orig/drivers/hid/hid-sony.c ++++ kernel-power-2.6.28/drivers/hid/hid-sony.c @@ -102,7 +102,7 @@ } @@ -5103,8 +5103,8 @@ goto err_stop; return 0; ---- kernel-maemo-2.6.28.test.orig/drivers/hwmon/abituguru3.c -+++ kernel-maemo-2.6.28.test/drivers/hwmon/abituguru3.c +--- kernel-power-2.6.28.orig/drivers/hwmon/abituguru3.c ++++ kernel-power-2.6.28/drivers/hwmon/abituguru3.c @@ -1153,7 +1153,7 @@ static inline int abituguru3_dmi_detect(void) @@ -5114,8 +5114,8 @@ } #endif /* CONFIG_DMI */ ---- kernel-maemo-2.6.28.test.orig/drivers/hwmon/f71882fg.c -+++ kernel-maemo-2.6.28.test/drivers/hwmon/f71882fg.c +--- kernel-power-2.6.28.orig/drivers/hwmon/f71882fg.c ++++ kernel-power-2.6.28/drivers/hwmon/f71882fg.c @@ -837,7 +837,7 @@ devid = superio_inw(sioaddr, SIO_REG_MANID); @@ -5125,8 +5125,8 @@ goto exit; } ---- kernel-maemo-2.6.28.test.orig/drivers/hwmon/it87.c -+++ kernel-maemo-2.6.28.test/drivers/hwmon/it87.c +--- kernel-power-2.6.28.orig/drivers/hwmon/it87.c ++++ kernel-power-2.6.28/drivers/hwmon/it87.c @@ -207,7 +207,7 @@ #define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?(((val)-500)/1000):\ @@ -5149,8 +5149,8 @@ u8 sensor; /* Register value */ u8 fan_div[3]; /* Register encoding, shifted right */ u8 vid; /* Register encoding, combined */ ---- kernel-maemo-2.6.28.test.orig/drivers/i2c/busses/i2c-acorn.c -+++ kernel-maemo-2.6.28.test/drivers/i2c/busses/i2c-acorn.c +--- kernel-power-2.6.28.orig/drivers/i2c/busses/i2c-acorn.c ++++ kernel-power-2.6.28/drivers/i2c/busses/i2c-acorn.c @@ -84,6 +84,7 @@ static struct i2c_adapter ioc_ops = { @@ -5168,8 +5168,8 @@ } module_init(i2c_ioc_init); ---- kernel-maemo-2.6.28.test.orig/drivers/i2c/busses/i2c-amd8111.c -+++ kernel-maemo-2.6.28.test/drivers/i2c/busses/i2c-amd8111.c +--- kernel-power-2.6.28.orig/drivers/i2c/busses/i2c-amd8111.c ++++ kernel-power-2.6.28/drivers/i2c/busses/i2c-amd8111.c @@ -72,7 +72,7 @@ { int timeout = 500; @@ -5188,8 +5188,8 @@ udelay(1); if (!timeout) { ---- kernel-maemo-2.6.28.test.orig/drivers/i2c/busses/i2c-pxa.c -+++ kernel-maemo-2.6.28.test/drivers/i2c/busses/i2c-pxa.c +--- kernel-power-2.6.28.orig/drivers/i2c/busses/i2c-pxa.c ++++ kernel-power-2.6.28/drivers/i2c/busses/i2c-pxa.c @@ -644,7 +644,7 @@ i2c_pxa_start_message(i2c); @@ -5199,8 +5199,8 @@ i2c_pxa_handler(0, i2c); udelay(10); } ---- kernel-maemo-2.6.28.test.orig/drivers/i2c/i2c-core.c -+++ kernel-maemo-2.6.28.test/drivers/i2c/i2c-core.c +--- kernel-power-2.6.28.orig/drivers/i2c/i2c-core.c ++++ kernel-power-2.6.28/drivers/i2c/i2c-core.c @@ -1831,7 +1831,8 @@ case I2C_SMBUS_QUICK: msg[0].len = 0; @@ -5211,8 +5211,8 @@ num = 1; break; case I2C_SMBUS_BYTE: ---- kernel-maemo-2.6.28.test.orig/drivers/ide/hpt366.c -+++ kernel-maemo-2.6.28.test/drivers/ide/hpt366.c +--- kernel-power-2.6.28.orig/drivers/ide/hpt366.c ++++ kernel-power-2.6.28/drivers/ide/hpt366.c @@ -114,6 +114,8 @@ * the register setting lists into the table indexed by the clock selected * - set the correct hwif->ultra_mask for each individual chip @@ -5231,8 +5231,8 @@ #undef HPT_DELAY_INTERRUPT #define HPT_SERIALIZE_IO 0 ---- kernel-maemo-2.6.28.test.orig/drivers/ide/ide-cd.c -+++ kernel-maemo-2.6.28.test/drivers/ide/ide-cd.c +--- kernel-power-2.6.28.orig/drivers/ide/ide-cd.c ++++ kernel-power-2.6.28/drivers/ide/ide-cd.c @@ -984,6 +984,9 @@ if (blk_fs_request(rq)) { ide_end_request(drive, 1, rq->nr_sectors); @@ -5243,8 +5243,8 @@ } goto end_request; } ---- kernel-maemo-2.6.28.test.orig/drivers/ide/ide-io.c -+++ kernel-maemo-2.6.28.test/drivers/ide/ide-io.c +--- kernel-power-2.6.28.orig/drivers/ide/ide-io.c ++++ kernel-power-2.6.28/drivers/ide/ide-io.c @@ -577,11 +577,14 @@ if (hwif->sg_mapped) /* needed by ide-scsi */ return; @@ -5263,8 +5263,8 @@ } } ---- kernel-maemo-2.6.28.test.orig/drivers/ide/ide-iops.c -+++ kernel-maemo-2.6.28.test/drivers/ide/ide-iops.c +--- kernel-power-2.6.28.orig/drivers/ide/ide-iops.c ++++ kernel-power-2.6.28/drivers/ide/ide-iops.c @@ -324,6 +324,8 @@ u8 io_32bit = drive->io_32bit; u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; @@ -5274,8 +5274,8 @@ if (io_32bit) { unsigned long uninitialized_var(flags); ---- kernel-maemo-2.6.28.test.orig/drivers/ide/it821x.c -+++ kernel-maemo-2.6.28.test/drivers/ide/it821x.c +--- kernel-power-2.6.28.orig/drivers/ide/it821x.c ++++ kernel-power-2.6.28/drivers/ide/it821x.c @@ -68,6 +68,8 @@ #define DRV_NAME "it821x" @@ -5323,8 +5323,8 @@ { 0, }, }; ---- kernel-maemo-2.6.28.test.orig/drivers/ide/tx4938ide.c -+++ kernel-maemo-2.6.28.test/drivers/ide/tx4938ide.c +--- kernel-power-2.6.28.orig/drivers/ide/tx4938ide.c ++++ kernel-power-2.6.28/drivers/ide/tx4938ide.c @@ -181,7 +181,7 @@ while (count--) @@ -5343,8 +5343,8 @@ } static const struct ide_tp_ops tx4938ide_tp_ops = { ---- kernel-maemo-2.6.28.test.orig/drivers/ide/tx4939ide.c -+++ kernel-maemo-2.6.28.test/drivers/ide/tx4939ide.c +--- kernel-power-2.6.28.orig/drivers/ide/tx4939ide.c ++++ kernel-power-2.6.28/drivers/ide/tx4939ide.c @@ -259,6 +259,12 @@ bcount = 0x10000 - (cur_addr & 0xffff); if (bcount > cur_len) @@ -5376,8 +5376,8 @@ } static const struct ide_tp_ops tx4939ide_tp_ops = { ---- kernel-maemo-2.6.28.test.orig/drivers/ieee1394/ohci1394.h -+++ kernel-maemo-2.6.28.test/drivers/ieee1394/ohci1394.h +--- kernel-power-2.6.28.orig/drivers/ieee1394/ohci1394.h ++++ kernel-power-2.6.28/drivers/ieee1394/ohci1394.h @@ -26,7 +26,7 @@ #define OHCI1394_DRIVER_NAME "ohci1394" @@ -5387,8 +5387,8 @@ #define OHCI1394_MAX_AT_RESP_RETRIES 0x2 #define OHCI1394_MAX_PHYS_RESP_RETRIES 0x8 #define OHCI1394_MAX_SELF_ID_ERRORS 16 ---- kernel-maemo-2.6.28.test.orig/drivers/ieee1394/sbp2.c -+++ kernel-maemo-2.6.28.test/drivers/ieee1394/sbp2.c +--- kernel-power-2.6.28.orig/drivers/ieee1394/sbp2.c ++++ kernel-power-2.6.28/drivers/ieee1394/sbp2.c @@ -395,6 +395,16 @@ .model_id = SBP2_ROM_VALUE_WILDCARD, .workarounds = SBP2_WORKAROUND_128K_MAX_TRANS, @@ -5406,8 +5406,8 @@ /* iPod 4th generation */ { .firmware_revision = 0x0a2700, .model_id = 0x000021, ---- kernel-maemo-2.6.28.test.orig/drivers/infiniband/hw/nes/nes_cm.c -+++ kernel-maemo-2.6.28.test/drivers/infiniband/hw/nes/nes_cm.c +--- kernel-power-2.6.28.orig/drivers/infiniband/hw/nes/nes_cm.c ++++ kernel-power-2.6.28/drivers/infiniband/hw/nes/nes_cm.c @@ -2495,12 +2495,14 @@ int ret = 0; struct nes_vnic *nesvnic; @@ -5489,8 +5489,8 @@ nesqp->nesqp_context->ird_ord_sizes |= cpu_to_le32(NES_QPCONTEXT_ORDIRD_LSMM_PRESENT | ---- kernel-maemo-2.6.28.test.orig/drivers/infiniband/hw/nes/nes_verbs.c -+++ kernel-maemo-2.6.28.test/drivers/infiniband/hw/nes/nes_verbs.c +--- kernel-power-2.6.28.orig/drivers/infiniband/hw/nes/nes_verbs.c ++++ kernel-power-2.6.28/drivers/infiniband/hw/nes/nes_verbs.c @@ -1360,8 +1360,10 @@ NES_QPCONTEXT_MISC_RQ_SIZE_SHIFT); nesqp->nesqp_context->misc |= cpu_to_le32((u32)nesqp->hwqp.sq_encoded_size << @@ -5502,8 +5502,8 @@ nesqp->nesqp_context->cqs = cpu_to_le32(nesqp->nesscq->hw_cq.cq_number + ((u32)nesqp->nesrcq->hw_cq.cq_number << 16)); u64temp = (u64)nesqp->hwqp.sq_pbase; ---- kernel-maemo-2.6.28.test.orig/drivers/infiniband/hw/nes/nes_verbs.h -+++ kernel-maemo-2.6.28.test/drivers/infiniband/hw/nes/nes_verbs.h +--- kernel-power-2.6.28.orig/drivers/infiniband/hw/nes/nes_verbs.h ++++ kernel-power-2.6.28/drivers/infiniband/hw/nes/nes_verbs.h @@ -134,6 +134,7 @@ struct ietf_mpa_frame *ietf_frame; dma_addr_t ietf_frame_pbase; @@ -5512,8 +5512,8 @@ unsigned long socket; struct nes_hw_qp hwqp; struct work_struct work; ---- kernel-maemo-2.6.28.test.orig/drivers/input/gameport/gameport.c -+++ kernel-maemo-2.6.28.test/drivers/input/gameport/gameport.c +--- kernel-power-2.6.28.orig/drivers/input/gameport/gameport.c ++++ kernel-power-2.6.28/drivers/input/gameport/gameport.c @@ -50,9 +50,8 @@ static struct bus_type gameport_bus; @@ -5562,8 +5562,8 @@ drv->driver.name, error); } ---- kernel-maemo-2.6.28.test.orig/drivers/input/keyboard/atkbd.c -+++ kernel-maemo-2.6.28.test/drivers/input/keyboard/atkbd.c +--- kernel-power-2.6.28.orig/drivers/input/keyboard/atkbd.c ++++ kernel-power-2.6.28/drivers/input/keyboard/atkbd.c @@ -884,6 +884,22 @@ } @@ -5603,8 +5603,8 @@ { } }; ---- kernel-maemo-2.6.28.test.orig/drivers/isdn/gigaset/bas-gigaset.c -+++ kernel-maemo-2.6.28.test/drivers/isdn/gigaset/bas-gigaset.c +--- kernel-power-2.6.28.orig/drivers/isdn/gigaset/bas-gigaset.c ++++ kernel-power-2.6.28/drivers/isdn/gigaset/bas-gigaset.c @@ -46,6 +46,9 @@ /* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */ #define IF_WRITEBUF 264 @@ -5663,8 +5663,8 @@ endpoint->bInterval); if ((rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL)) != 0) { dev_err(cs->dev, "could not submit interrupt URB: %s\n", ---- kernel-maemo-2.6.28.test.orig/drivers/md/bitmap.c -+++ kernel-maemo-2.6.28.test/drivers/md/bitmap.c +--- kernel-power-2.6.28.orig/drivers/md/bitmap.c ++++ kernel-power-2.6.28/drivers/md/bitmap.c @@ -964,9 +964,11 @@ */ page = bitmap->sb_page; @@ -5680,8 +5680,8 @@ } else if (file) { page = read_page(file, index, bitmap, count); offset = 0; ---- kernel-maemo-2.6.28.test.orig/drivers/md/dm-crypt.c -+++ kernel-maemo-2.6.28.test/drivers/md/dm-crypt.c +--- kernel-power-2.6.28.orig/drivers/md/dm-crypt.c ++++ kernel-power-2.6.28/drivers/md/dm-crypt.c @@ -60,6 +60,7 @@ }; @@ -5783,8 +5783,8 @@ if (!atomic_dec_and_test(&ctx->pending)) return; ---- kernel-maemo-2.6.28.test.orig/drivers/md/dm-io.c -+++ kernel-maemo-2.6.28.test/drivers/md/dm-io.c +--- kernel-power-2.6.28.orig/drivers/md/dm-io.c ++++ kernel-power-2.6.28/drivers/md/dm-io.c @@ -292,6 +292,8 @@ (PAGE_SIZE >> SECTOR_SHIFT)); num_bvecs = 1 + min_t(int, bio_get_nr_vecs(where->bdev), @@ -5794,8 +5794,8 @@ bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios); bio->bi_sector = where->sector + (where->count - remaining); bio->bi_bdev = where->bdev; ---- kernel-maemo-2.6.28.test.orig/drivers/md/dm-ioctl.c -+++ kernel-maemo-2.6.28.test/drivers/md/dm-ioctl.c +--- kernel-power-2.6.28.orig/drivers/md/dm-ioctl.c ++++ kernel-power-2.6.28/drivers/md/dm-ioctl.c @@ -704,7 +704,8 @@ char *new_name = (char *) param + param->data_start; @@ -5806,8 +5806,8 @@ DMWARN("Invalid new logical volume name supplied."); return -EINVAL; } ---- kernel-maemo-2.6.28.test.orig/drivers/md/dm-log.c -+++ kernel-maemo-2.6.28.test/drivers/md/dm-log.c +--- kernel-power-2.6.28.orig/drivers/md/dm-log.c ++++ kernel-power-2.6.28/drivers/md/dm-log.c @@ -467,6 +467,7 @@ lc->disk_header = vmalloc(buf_size); if (!lc->disk_header) { @@ -5834,8 +5834,8 @@ vfree(lc->disk_header); kfree(lc); return -ENOMEM; ---- kernel-maemo-2.6.28.test.orig/drivers/md/dm-raid1.c -+++ kernel-maemo-2.6.28.test/drivers/md/dm-raid1.c +--- kernel-power-2.6.28.orig/drivers/md/dm-raid1.c ++++ kernel-power-2.6.28/drivers/md/dm-raid1.c @@ -197,9 +197,6 @@ struct mirror_set *ms = m->ms; struct mirror *new; @@ -5856,8 +5856,8 @@ if (m != get_default_mirror(ms)) goto out; ---- kernel-maemo-2.6.28.test.orig/drivers/md/dm.c -+++ kernel-maemo-2.6.28.test/drivers/md/dm.c +--- kernel-power-2.6.28.orig/drivers/md/dm.c ++++ kernel-power-2.6.28/drivers/md/dm.c @@ -480,9 +480,12 @@ static void dec_pending(struct dm_io *io, int error) { @@ -5936,8 +5936,8 @@ } static sector_t max_io_len(struct mapped_device *md, ---- kernel-maemo-2.6.28.test.orig/drivers/md/linear.c -+++ kernel-maemo-2.6.28.test/drivers/md/linear.c +--- kernel-power-2.6.28.orig/drivers/md/linear.c ++++ kernel-power-2.6.28/drivers/md/linear.c @@ -25,13 +25,13 @@ { dev_info_t *hash; @@ -5955,8 +5955,8 @@ while (sector >= hash->num_sectors + hash->start_sector) hash++; ---- kernel-maemo-2.6.28.test.orig/drivers/md/md.c -+++ kernel-maemo-2.6.28.test/drivers/md/md.c +--- kernel-power-2.6.28.orig/drivers/md/md.c ++++ kernel-power-2.6.28/drivers/md/md.c @@ -1447,6 +1447,11 @@ if (find_rdev_nr(mddev, rdev->desc_nr)) return -EBUSY; @@ -6072,8 +6072,8 @@ abort_export: export_rdev(rdev); return err; ---- kernel-maemo-2.6.28.test.orig/drivers/md/raid1.c -+++ kernel-maemo-2.6.28.test/drivers/md/raid1.c +--- kernel-power-2.6.28.orig/drivers/md/raid1.c ++++ kernel-power-2.6.28/drivers/md/raid1.c @@ -1233,8 +1233,9 @@ update_head_pos(mirror, r1_bio); @@ -6085,8 +6085,8 @@ } } ---- kernel-maemo-2.6.28.test.orig/drivers/md/raid10.c -+++ kernel-maemo-2.6.28.test/drivers/md/raid10.c +--- kernel-power-2.6.28.orig/drivers/md/raid10.c ++++ kernel-power-2.6.28/drivers/md/raid10.c @@ -1236,6 +1236,7 @@ /* for reconstruct, we always reschedule after a read. * for resync, only after all reads @@ -6162,8 +6162,8 @@ } static int run(mddev_t *mddev) ---- kernel-maemo-2.6.28.test.orig/drivers/media/common/tuners/tda8290.c -+++ kernel-maemo-2.6.28.test/drivers/media/common/tuners/tda8290.c +--- kernel-power-2.6.28.orig/drivers/media/common/tuners/tda8290.c ++++ kernel-power-2.6.28/drivers/media/common/tuners/tda8290.c @@ -724,7 +724,8 @@ fe->ops.analog_ops.info.name = name; @@ -6174,8 +6174,8 @@ tda8290_init_if(fe); } else if (priv->ver & TDA8295) tda8295_init_if(fe); ---- kernel-maemo-2.6.28.test.orig/drivers/media/dvb/frontends/s5h1409.c -+++ kernel-maemo-2.6.28.test/drivers/media/dvb/frontends/s5h1409.c +--- kernel-power-2.6.28.orig/drivers/media/dvb/frontends/s5h1409.c ++++ kernel-power-2.6.28/drivers/media/dvb/frontends/s5h1409.c @@ -545,9 +545,6 @@ s5h1409_enable_modulation(fe, p->u.vsb.modulation); @@ -6197,8 +6197,8 @@ return 0; } ---- kernel-maemo-2.6.28.test.orig/drivers/media/video/cx23885/cx23885-417.c -+++ kernel-maemo-2.6.28.test/drivers/media/video/cx23885/cx23885-417.c +--- kernel-power-2.6.28.orig/drivers/media/video/cx23885/cx23885-417.c ++++ kernel-power-2.6.28/drivers/media/video/cx23885/cx23885-417.c @@ -1585,7 +1585,8 @@ lock_kernel(); list_for_each(list, &cx23885_devlist) { @@ -6209,8 +6209,8 @@ dev = h; break; } ---- kernel-maemo-2.6.28.test.orig/drivers/media/video/cx23885/cx23885-video.c -+++ kernel-maemo-2.6.28.test/drivers/media/video/cx23885/cx23885-video.c +--- kernel-power-2.6.28.orig/drivers/media/video/cx23885/cx23885-video.c ++++ kernel-power-2.6.28/drivers/media/video/cx23885/cx23885-video.c @@ -730,12 +730,13 @@ lock_kernel(); list_for_each(list, &cx23885_devlist) { @@ -6227,8 +6227,8 @@ dev = h; type = V4L2_BUF_TYPE_VBI_CAPTURE; } ---- kernel-maemo-2.6.28.test.orig/drivers/media/video/ivtv/ivtv-ioctl.c -+++ kernel-maemo-2.6.28.test/drivers/media/video/ivtv/ivtv-ioctl.c +--- kernel-power-2.6.28.orig/drivers/media/video/ivtv/ivtv-ioctl.c ++++ kernel-power-2.6.28/drivers/media/video/ivtv/ivtv-ioctl.c @@ -1750,6 +1750,18 @@ break; } @@ -6267,8 +6267,8 @@ default: break; } ---- kernel-maemo-2.6.28.test.orig/drivers/media/video/saa7127.c -+++ kernel-maemo-2.6.28.test/drivers/media/video/saa7127.c +--- kernel-power-2.6.28.orig/drivers/media/video/saa7127.c ++++ kernel-power-2.6.28/drivers/media/video/saa7127.c @@ -149,7 +149,7 @@ { SAA7127_REG_COPYGEN_0, 0x77 }, { SAA7127_REG_COPYGEN_1, 0x41 }, @@ -6360,8 +6360,8 @@ if (state->ident == V4L2_IDENT_SAA7129) saa7127_write_inittab(client, saa7129_init_config_extra); return 0; ---- kernel-maemo-2.6.28.test.orig/drivers/misc/acer-wmi.c -+++ kernel-maemo-2.6.28.test/drivers/misc/acer-wmi.c +--- kernel-power-2.6.28.orig/drivers/misc/acer-wmi.c ++++ kernel-power-2.6.28/drivers/misc/acer-wmi.c @@ -1297,7 +1297,7 @@ set_quirks(); @@ -6371,8 +6371,8 @@ interface->capability &= ~ACER_CAP_BRIGHTNESS; printk(ACER_INFO "Brightness must be controlled by " "generic video driver\n"); ---- kernel-maemo-2.6.28.test.orig/drivers/misc/eeepc-laptop.c -+++ kernel-maemo-2.6.28.test/drivers/misc/eeepc-laptop.c +--- kernel-power-2.6.28.orig/drivers/misc/eeepc-laptop.c ++++ kernel-power-2.6.28/drivers/misc/eeepc-laptop.c @@ -161,6 +161,10 @@ {KE_KEY, 0x13, KEY_MUTE }, {KE_KEY, 0x14, KEY_VOLUMEDOWN }, @@ -6394,8 +6394,8 @@ } static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data) ---- kernel-maemo-2.6.28.test.orig/drivers/misc/hpilo.c -+++ kernel-maemo-2.6.28.test/drivers/misc/hpilo.c +--- kernel-power-2.6.28.orig/drivers/misc/hpilo.c ++++ kernel-power-2.6.28/drivers/misc/hpilo.c @@ -710,6 +710,7 @@ static struct pci_device_id ilo_devices[] = { @@ -6404,8 +6404,8 @@ { } }; MODULE_DEVICE_TABLE(pci, ilo_devices); ---- kernel-maemo-2.6.28.test.orig/drivers/misc/panasonic-laptop.c -+++ kernel-maemo-2.6.28.test/drivers/misc/panasonic-laptop.c +--- kernel-power-2.6.28.orig/drivers/misc/panasonic-laptop.c ++++ kernel-power-2.6.28/drivers/misc/panasonic-laptop.c @@ -515,7 +515,7 @@ hkey_num = result & 0xf; @@ -6415,8 +6415,8 @@ ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "hotkey number out of range: %d\n", hkey_num)); ---- kernel-maemo-2.6.28.test.orig/drivers/misc/sgi-xp/xpc.h -+++ kernel-maemo-2.6.28.test/drivers/misc/sgi-xp/xpc.h +--- kernel-power-2.6.28.orig/drivers/misc/sgi-xp/xpc.h ++++ kernel-power-2.6.28/drivers/misc/sgi-xp/xpc.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -6436,8 +6436,8 @@ struct xpc_fifo_head_uv msg_slot_free_list; struct xpc_fifo_head_uv recv_msg_list; /* deliverable payloads */ ---- kernel-maemo-2.6.28.test.orig/drivers/misc/sgi-xp/xpc_sn2.c -+++ kernel-maemo-2.6.28.test/drivers/misc/sgi-xp/xpc_sn2.c +--- kernel-power-2.6.28.orig/drivers/misc/sgi-xp/xpc_sn2.c ++++ kernel-power-2.6.28/drivers/misc/sgi-xp/xpc_sn2.c @@ -904,7 +904,7 @@ dev_dbg(xpc_part, " remote_vars_pa = 0x%016lx\n", part_sn2->remote_vars_pa); @@ -6509,8 +6509,8 @@ /* * See if this message is next in line to be acknowledged as having ---- kernel-maemo-2.6.28.test.orig/drivers/misc/sgi-xp/xpc_uv.c -+++ kernel-maemo-2.6.28.test/drivers/misc/sgi-xp/xpc_uv.c +--- kernel-power-2.6.28.orig/drivers/misc/sgi-xp/xpc_uv.c ++++ kernel-power-2.6.28/drivers/misc/sgi-xp/xpc_uv.c @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -6552,8 +6552,8 @@ msg_slot->func = func; if (ch->flags & XPC_C_DISCONNECTING) { ---- kernel-maemo-2.6.28.test.orig/drivers/misc/thinkpad_acpi.c -+++ kernel-maemo-2.6.28.test/drivers/misc/thinkpad_acpi.c +--- kernel-power-2.6.28.orig/drivers/misc/thinkpad_acpi.c ++++ kernel-power-2.6.28/drivers/misc/thinkpad_acpi.c @@ -281,11 +281,17 @@ static struct workqueue_struct *tpacpi_wq; @@ -6676,8 +6676,8 @@ MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh"); MODULE_DESCRIPTION(TPACPI_DESC); ---- kernel-maemo-2.6.28.test.orig/drivers/mmc/card/mmc_test.c -+++ kernel-maemo-2.6.28.test/drivers/mmc/card/mmc_test.c +--- kernel-power-2.6.28.orig/drivers/mmc/card/mmc_test.c ++++ kernel-power-2.6.28/drivers/mmc/card/mmc_test.c @@ -494,7 +494,7 @@ sg_init_one(&sg, test->buffer, 512); @@ -6687,8 +6687,8 @@ if (ret) return ret; ---- kernel-maemo-2.6.28.test.orig/drivers/mmc/host/s3cmci.c -+++ kernel-maemo-2.6.28.test/drivers/mmc/host/s3cmci.c +--- kernel-power-2.6.28.orig/drivers/mmc/host/s3cmci.c ++++ kernel-power-2.6.28/drivers/mmc/host/s3cmci.c @@ -329,7 +329,7 @@ to_ptr = host->base + host->sdidata; @@ -6708,8 +6708,8 @@ s3c2410_dma_set_buffdone_fn(host->dma, s3cmci_dma_done_callback); s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART); ---- kernel-maemo-2.6.28.test.orig/drivers/mmc/host/sdhci-pci.c -+++ kernel-maemo-2.6.28.test/drivers/mmc/host/sdhci-pci.c +--- kernel-power-2.6.28.orig/drivers/mmc/host/sdhci-pci.c ++++ kernel-power-2.6.28/drivers/mmc/host/sdhci-pci.c @@ -107,6 +107,7 @@ static const struct sdhci_pci_fixes sdhci_cafe = { @@ -6718,8 +6718,8 @@ SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, }; ---- kernel-maemo-2.6.28.test.orig/drivers/mmc/host/sdhci.c -+++ kernel-maemo-2.6.28.test/drivers/mmc/host/sdhci.c +--- kernel-power-2.6.28.orig/drivers/mmc/host/sdhci.c ++++ kernel-power-2.6.28/drivers/mmc/host/sdhci.c @@ -1286,8 +1286,11 @@ if (host->cmd->data) DBG("Cannot wait for busy signal when also " @@ -6744,8 +6744,8 @@ host->led.brightness = LED_OFF; host->led.default_trigger = mmc_hostname(mmc); host->led.brightness_set = sdhci_led_control; ---- kernel-maemo-2.6.28.test.orig/drivers/mmc/host/sdhci.h -+++ kernel-maemo-2.6.28.test/drivers/mmc/host/sdhci.h +--- kernel-power-2.6.28.orig/drivers/mmc/host/sdhci.h ++++ kernel-power-2.6.28/drivers/mmc/host/sdhci.h @@ -210,6 +210,8 @@ #define SDHCI_QUIRK_BROKEN_SMALL_PIO (1<<13) /* Controller supports high speed but doesn't have the caps bit set */ @@ -6763,8 +6763,8 @@ #endif spinlock_t lock; /* Mutex */ ---- kernel-maemo-2.6.28.test.orig/drivers/mtd/devices/mtd_dataflash.c -+++ kernel-maemo-2.6.28.test/drivers/mtd/devices/mtd_dataflash.c +--- kernel-power-2.6.28.orig/drivers/mtd/devices/mtd_dataflash.c ++++ kernel-power-2.6.28/drivers/mtd/devices/mtd_dataflash.c @@ -815,7 +815,8 @@ if (!(info->flags & IS_POW2PS)) return info; @@ -6775,8 +6775,8 @@ } } ---- kernel-maemo-2.6.28.test.orig/drivers/net/3c505.c -+++ kernel-maemo-2.6.28.test/drivers/net/3c505.c +--- kernel-power-2.6.28.orig/drivers/net/3c505.c ++++ kernel-power-2.6.28/drivers/net/3c505.c @@ -493,21 +493,27 @@ } /* read the data */ @@ -6815,8 +6815,8 @@ /* safety check total length vs data length */ if (total_length != (pcb->length + 2)) { ---- kernel-maemo-2.6.28.test.orig/drivers/net/b44.c -+++ kernel-maemo-2.6.28.test/drivers/net/b44.c +--- kernel-power-2.6.28.orig/drivers/net/b44.c ++++ kernel-power-2.6.28/drivers/net/b44.c @@ -750,7 +750,7 @@ dest_idx * sizeof(dest_desc), DMA_BIDIRECTIONAL); @@ -6826,8 +6826,8 @@ RX_PKT_BUF_SZ, DMA_FROM_DEVICE); } ---- kernel-maemo-2.6.28.test.orig/drivers/net/bnx2x_main.c -+++ kernel-maemo-2.6.28.test/drivers/net/bnx2x_main.c +--- kernel-power-2.6.28.orig/drivers/net/bnx2x_main.c ++++ kernel-power-2.6.28/drivers/net/bnx2x_main.c @@ -8079,6 +8079,9 @@ struct bnx2x *bp = netdev_priv(dev); int rc; @@ -6838,8 +6838,8 @@ DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n" DP_LEVEL " magic 0x%x offset 0x%x (%d) len 0x%x (%d)\n", eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset, ---- kernel-maemo-2.6.28.test.orig/drivers/net/bonding/bond_main.c -+++ kernel-maemo-2.6.28.test/drivers/net/bonding/bond_main.c +--- kernel-power-2.6.28.orig/drivers/net/bonding/bond_main.c ++++ kernel-power-2.6.28/drivers/net/bonding/bond_main.c @@ -3536,11 +3536,26 @@ } break; @@ -6872,8 +6872,8 @@ break; case NETDEV_DOWN: /* ---- kernel-maemo-2.6.28.test.orig/drivers/net/bonding/bonding.h -+++ kernel-maemo-2.6.28.test/drivers/net/bonding/bonding.h +--- kernel-power-2.6.28.orig/drivers/net/bonding/bonding.h ++++ kernel-power-2.6.28/drivers/net/bonding/bonding.h @@ -248,6 +248,12 @@ return (struct bonding *)slave->dev->master->priv; } @@ -6887,8 +6887,8 @@ #define BOND_FOM_NONE 0 #define BOND_FOM_ACTIVE 1 #define BOND_FOM_FOLLOW 2 ---- kernel-maemo-2.6.28.test.orig/drivers/net/e1000/e1000_main.c -+++ kernel-maemo-2.6.28.test/drivers/net/e1000/e1000_main.c +--- kernel-power-2.6.28.orig/drivers/net/e1000/e1000_main.c ++++ kernel-power-2.6.28/drivers/net/e1000/e1000_main.c @@ -31,7 +31,7 @@ char e1000_driver_name[] = "e1000"; @@ -6916,8 +6916,8 @@ return IRQ_NONE; /* Not our interrupt */ /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is ---- kernel-maemo-2.6.28.test.orig/drivers/net/irda/irda-usb.c -+++ kernel-maemo-2.6.28.test/drivers/net/irda/irda-usb.c +--- kernel-power-2.6.28.orig/drivers/net/irda/irda-usb.c ++++ kernel-power-2.6.28/drivers/net/irda/irda-usb.c @@ -1075,7 +1075,7 @@ { unsigned int i; @@ -6927,8 +6927,8 @@ const struct firmware *fw; const unsigned char *fw_version_ptr; /* pointer to version string */ unsigned long fw_version = 0; ---- kernel-maemo-2.6.28.test.orig/drivers/net/r6040.c -+++ kernel-maemo-2.6.28.test/drivers/net/r6040.c +--- kernel-power-2.6.28.orig/drivers/net/r6040.c ++++ kernel-power-2.6.28/drivers/net/r6040.c @@ -49,8 +49,8 @@ #include @@ -6989,8 +6989,8 @@ return IRQ_HANDLED; } ---- kernel-maemo-2.6.28.test.orig/drivers/net/r8169.c -+++ kernel-maemo-2.6.28.test/drivers/net/r8169.c +--- kernel-power-2.6.28.orig/drivers/net/r8169.c ++++ kernel-power-2.6.28/drivers/net/r8169.c @@ -2026,8 +2026,7 @@ if (!tp->pcie_cap && netif_msg_probe(tp)) dev_info(&pdev->dev, "no PCI Express capability\n"); @@ -7010,8 +7010,8 @@ /* Identify chip attached to board */ rtl8169_get_mac_version(tp, ioaddr); ---- kernel-maemo-2.6.28.test.orig/drivers/net/skfp/skfddi.c -+++ kernel-maemo-2.6.28.test/drivers/net/skfp/skfddi.c +--- kernel-power-2.6.28.orig/drivers/net/skfp/skfddi.c ++++ kernel-power-2.6.28/drivers/net/skfp/skfddi.c @@ -998,9 +998,9 @@ break; case SKFP_CLR_STATS: /* Zero out the driver statistics */ @@ -7024,8 +7024,8 @@ } break; default: ---- kernel-maemo-2.6.28.test.orig/drivers/net/sky2.c -+++ kernel-maemo-2.6.28.test/drivers/net/sky2.c +--- kernel-power-2.6.28.orig/drivers/net/sky2.c ++++ kernel-power-2.6.28/drivers/net/sky2.c @@ -1403,9 +1403,6 @@ } @@ -7046,8 +7046,8 @@ return 0; err_out: ---- kernel-maemo-2.6.28.test.orig/drivers/net/sungem.c -+++ kernel-maemo-2.6.28.test/drivers/net/sungem.c +--- kernel-power-2.6.28.orig/drivers/net/sungem.c ++++ kernel-power-2.6.28/drivers/net/sungem.c @@ -2222,6 +2222,8 @@ gp->running = 1; @@ -7084,8 +7084,8 @@ } spin_lock_irqsave(&gp->lock, flags); ---- kernel-maemo-2.6.28.test.orig/drivers/net/tun.c -+++ kernel-maemo-2.6.28.test/drivers/net/tun.c +--- kernel-power-2.6.28.orig/drivers/net/tun.c ++++ kernel-power-2.6.28/drivers/net/tun.c @@ -157,10 +157,16 @@ nexact = n; @@ -7105,8 +7105,8 @@ /* For ALLMULTI just set the mask to all ones. * This overrides the mask populated above. */ ---- kernel-maemo-2.6.28.test.orig/drivers/net/usb/asix.c -+++ kernel-maemo-2.6.28.test/drivers/net/usb/asix.c +--- kernel-power-2.6.28.orig/drivers/net/usb/asix.c ++++ kernel-power-2.6.28/drivers/net/usb/asix.c @@ -1450,6 +1450,14 @@ // Cables-to-Go USB Ethernet Adapter USB_DEVICE(0x0b95, 0x772a), @@ -7122,8 +7122,8 @@ }, { }, // END }; ---- kernel-maemo-2.6.28.test.orig/drivers/net/usb/cdc_ether.c -+++ kernel-maemo-2.6.28.test/drivers/net/usb/cdc_ether.c +--- kernel-power-2.6.28.orig/drivers/net/usb/cdc_ether.c ++++ kernel-power-2.6.28/drivers/net/usb/cdc_ether.c @@ -559,6 +559,11 @@ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), @@ -7136,8 +7136,8 @@ }, { }, // END }; ---- kernel-maemo-2.6.28.test.orig/drivers/net/usb/zaurus.c -+++ kernel-maemo-2.6.28.test/drivers/net/usb/zaurus.c +--- kernel-power-2.6.28.orig/drivers/net/usb/zaurus.c ++++ kernel-power-2.6.28/drivers/net/usb/zaurus.c @@ -341,6 +341,11 @@ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), @@ -7150,8 +7150,8 @@ }, /* Olympus has some models with a Zaurus-compatible option. ---- kernel-maemo-2.6.28.test.orig/drivers/net/virtio_net.c -+++ kernel-maemo-2.6.28.test/drivers/net/virtio_net.c +--- kernel-power-2.6.28.orig/drivers/net/virtio_net.c ++++ kernel-power-2.6.28/drivers/net/virtio_net.c @@ -24,6 +24,7 @@ #include #include @@ -7169,8 +7169,8 @@ struct virtnet_info { ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ath5k/base.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ath5k/base.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/ath5k/base.c ++++ kernel-power-2.6.28/drivers/net/wireless/ath5k/base.c @@ -2157,7 +2157,8 @@ if (sc->opmode == NL80211_IFTYPE_STATION) { @@ -7209,8 +7209,8 @@ /* Set filters */ ath5k_hw_set_rx_filter(ah,rfilt); ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ath5k/phy.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ath5k/phy.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/ath5k/phy.c ++++ kernel-power-2.6.28/drivers/net/wireless/ath5k/phy.c @@ -2195,9 +2195,7 @@ return ret; } @@ -7222,8 +7222,8 @@ /* * Re-enable RX/TX and beacons ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ath5k/reset.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ath5k/reset.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/ath5k/reset.c ++++ kernel-power-2.6.28/drivers/net/wireless/ath5k/reset.c @@ -842,9 +842,7 @@ * * XXX: Find an interval that's OK for all cards... @@ -7235,8 +7235,8 @@ /* * Reset queues and start beacon timers at the end of the reset routine ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ath9k/ath9k.h -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ath9k/ath9k.h +--- kernel-power-2.6.28.orig/drivers/net/wireless/ath9k/ath9k.h ++++ kernel-power-2.6.28/drivers/net/wireless/ath9k/ath9k.h @@ -590,8 +590,8 @@ u8 iso[3]; }; @@ -7248,8 +7248,8 @@ #define SM(_v, _f) (((_v) << _f##_S) & _f) #define MS(_v, _f) (((_v) & _f) >> _f##_S) ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ath9k/core.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ath9k/core.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/ath9k/core.c ++++ kernel-power-2.6.28/drivers/net/wireless/ath9k/core.c @@ -1089,6 +1089,7 @@ sc->sc_cachelsz = csz << 2; /* convert to bytes */ @@ -7258,8 +7258,8 @@ ah = ath9k_hw_attach(devid, sc, sc->mem, &status); if (ah == NULL) { ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ath9k/core.h -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ath9k/core.h +--- kernel-power-2.6.28.orig/drivers/net/wireless/ath9k/core.h ++++ kernel-power-2.6.28/drivers/net/wireless/ath9k/core.h @@ -1040,6 +1040,7 @@ spinlock_t sc_rxbuflock; spinlock_t sc_txbuflock; @@ -7305,8 +7305,8 @@ +} + #endif /* CORE_H */ ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ath9k/hw.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ath9k/hw.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/ath9k/hw.c ++++ kernel-power-2.6.28/drivers/net/wireless/ath9k/hw.c @@ -346,6 +346,25 @@ } @@ -7343,8 +7343,8 @@ ah->ah_config.serialize_regmode = SER_REG_MODE_ON; } else { ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ath9k/recv.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ath9k/recv.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/ath9k/recv.c ++++ kernel-power-2.6.28/drivers/net/wireless/ath9k/recv.c @@ -627,9 +627,8 @@ rfilt &= ~ATH9K_RX_FILTER_UCAST; } @@ -7357,8 +7357,8 @@ rfilt |= ATH9K_RX_FILTER_BEACON; /* If in HOSTAP mode, want to enable reception of PSPOLL frames ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/b43/xmit.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/b43/xmit.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/b43/xmit.c ++++ kernel-power-2.6.28/drivers/net/wireless/b43/xmit.c @@ -51,7 +51,7 @@ } @@ -7368,8 +7368,8 @@ { int base = aphy ? 0 : 4; ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ipw2200.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ipw2200.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/ipw2200.c ++++ kernel-power-2.6.28/drivers/net/wireless/ipw2200.c @@ -4347,7 +4347,8 @@ return; } @@ -7432,8 +7432,8 @@ scan.dwell_time[IPW_SCAN_ACTIVE_DIRECT_SCAN] = cpu_to_le16(20); #ifdef CONFIG_IPW2200_MONITOR ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/ipw2200.h -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/ipw2200.h +--- kernel-power-2.6.28.orig/drivers/net/wireless/ipw2200.h ++++ kernel-power-2.6.28/drivers/net/wireless/ipw2200.h @@ -244,6 +244,7 @@ #define HOST_NOTIFICATION_S36_MEASUREMENT_REFUSED 31 @@ -7442,8 +7442,8 @@ #define IPW_MB_ROAMING_THRESHOLD_MIN 1 #define IPW_MB_ROAMING_THRESHOLD_DEFAULT 8 #define IPW_MB_ROAMING_THRESHOLD_MAX 30 ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/iwlwifi/iwl-3945-rs.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/iwlwifi/iwl-3945-rs.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/iwlwifi/iwl-3945-rs.c ++++ kernel-power-2.6.28/drivers/net/wireless/iwlwifi/iwl-3945-rs.c @@ -647,12 +647,16 @@ s8 scale_action = 0; unsigned long flags; @@ -7478,8 +7478,8 @@ index = min(rs_sta->last_txrate_idx & 0xffff, IWL_RATE_COUNT - 1); if (sband->band == IEEE80211_BAND_5GHZ) ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/iwlwifi/iwl-agn-rs.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/iwlwifi/iwl-agn-rs.c ++++ kernel-power-2.6.28/drivers/net/wireless/iwlwifi/iwl-agn-rs.c @@ -951,7 +951,8 @@ } @@ -7514,8 +7514,8 @@ return; } ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/iwlwifi/iwl-agn.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/iwlwifi/iwl-agn.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/iwlwifi/iwl-agn.c ++++ kernel-power-2.6.28/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -1334,16 +1334,6 @@ priv->cfg->ops->lib->rx_handler_setup(priv); } @@ -7542,8 +7542,8 @@ count = 0; } } ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/iwlwifi/iwl-rx.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/iwlwifi/iwl-rx.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/iwlwifi/iwl-rx.c ++++ kernel-power-2.6.28/drivers/net/wireless/iwlwifi/iwl-rx.c @@ -245,25 +245,31 @@ struct list_head *element; struct iwl_rx_mem_buffer *rxb; @@ -7602,8 +7602,8 @@ void iwl_rx_replenish(struct iwl_priv *priv) { ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/orinoco.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/orinoco.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/orinoco.c ++++ kernel-power-2.6.28/drivers/net/wireless/orinoco.c @@ -4938,32 +4938,29 @@ struct orinoco_private *priv = netdev_priv(dev); u8 *buf; @@ -7660,8 +7660,8 @@ } static int orinoco_ioctl_get_genie(struct net_device *dev, ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/p54/p54common.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/p54/p54common.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/p54/p54common.c ++++ kernel-power-2.6.28/drivers/net/wireless/p54/p54common.c @@ -741,17 +741,19 @@ int p54_read_eeprom(struct ieee80211_hw *dev) { @@ -7695,8 +7695,8 @@ kfree(eeprom); return ret; ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/p54/p54usb.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/p54/p54usb.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/p54/p54usb.c ++++ kernel-power-2.6.28/drivers/net/wireless/p54/p54usb.c @@ -54,6 +54,7 @@ {USB_DEVICE(0x050d, 0x7050)}, /* Belkin F5D7050 ver 1000 */ {USB_DEVICE(0x0572, 0x2000)}, /* Cohiba Proto board */ @@ -7955,8 +7955,8 @@ usb_get_dev(udev); ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/p54/p54usb.h -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/p54/p54usb.h +--- kernel-power-2.6.28.orig/drivers/net/wireless/p54/p54usb.h ++++ kernel-power-2.6.28/drivers/net/wireless/p54/p54usb.h @@ -133,6 +133,7 @@ spinlock_t lock; @@ -7965,8 +7965,8 @@ }; #endif /* P54USB_H */ ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/rt2x00/rt73usb.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/rt2x00/rt73usb.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/rt2x00/rt73usb.c ++++ kernel-power-2.6.28/drivers/net/wireless/rt2x00/rt73usb.c @@ -2434,6 +2434,7 @@ /* Linksys */ { USB_DEVICE(0x13b1, 0x0020), USB_DEVICE_DATA(&rt73usb_ops) }, @@ -7975,8 +7975,8 @@ /* MSI */ { USB_DEVICE(0x0db0, 0x6877), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x0db0, 0x6874), USB_DEVICE_DATA(&rt73usb_ops) }, ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/rtl8187_dev.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/rtl8187_dev.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/rtl8187_dev.c ++++ kernel-power-2.6.28/drivers/net/wireless/rtl8187_dev.c @@ -40,6 +40,10 @@ {USB_DEVICE(0x0bda, 0x8189), .driver_info = DEVICE_RTL8187B}, {USB_DEVICE(0x0bda, 0x8197), .driver_info = DEVICE_RTL8187B}, @@ -8013,8 +8013,8 @@ rc = usb_submit_urb(urb, GFP_ATOMIC); if (rc < 0) { usb_free_urb(urb); ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/rtl8187_rtl8225.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/rtl8187_rtl8225.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/rtl8187_rtl8225.c ++++ kernel-power-2.6.28/drivers/net/wireless/rtl8187_rtl8225.c @@ -287,7 +287,10 @@ ofdm_power = priv->channels[channel - 1].hw_value >> 4; @@ -8039,8 +8039,8 @@ ofdm_power += priv->txpwr_base >> 4; ofdm_power = min(ofdm_power, (u8)35); ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/zd1211rw/zd_rf.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/zd1211rw/zd_rf.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/zd1211rw/zd_rf.c ++++ kernel-power-2.6.28/drivers/net/wireless/zd1211rw/zd_rf.c @@ -86,6 +86,7 @@ case AL7230B_RF: r = zd_rf_init_al7230b(rf); @@ -8049,8 +8049,8 @@ case UW2453_RF: r = zd_rf_init_uw2453(rf); break; ---- kernel-maemo-2.6.28.test.orig/drivers/net/wireless/zd1211rw/zd_usb.c -+++ kernel-maemo-2.6.28.test/drivers/net/wireless/zd1211rw/zd_usb.c +--- kernel-power-2.6.28.orig/drivers/net/wireless/zd1211rw/zd_usb.c ++++ kernel-power-2.6.28/drivers/net/wireless/zd1211rw/zd_usb.c @@ -37,6 +37,7 @@ static struct usb_device_id usb_ids[] = { /* ZD1211 */ @@ -8059,8 +8059,8 @@ { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211 }, { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 }, { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 }, ---- kernel-maemo-2.6.28.test.orig/drivers/parport/parport_serial.c -+++ kernel-maemo-2.6.28.test/drivers/parport/parport_serial.c +--- kernel-power-2.6.28.orig/drivers/parport/parport_serial.c ++++ kernel-power-2.6.28/drivers/parport/parport_serial.c @@ -64,6 +64,11 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *card, int autoirq, int autodma) @@ -8073,8 +8073,8 @@ /* * Netmos uses the subdevice ID to indicate the number of parallel * and serial ports. The form is 0x00PS, where

is the number of ---- kernel-maemo-2.6.28.test.orig/drivers/pci/hotplug/pciehp_core.c -+++ kernel-maemo-2.6.28.test/drivers/pci/hotplug/pciehp_core.c +--- kernel-power-2.6.28.orig/drivers/pci/hotplug/pciehp_core.c ++++ kernel-power-2.6.28/drivers/pci/hotplug/pciehp_core.c @@ -126,8 +126,10 @@ mutex_lock(&slot->ctrl->crit_sect); @@ -8087,8 +8087,8 @@ /* see what our current state is */ retval = get_lock_status(hotplug_slot, &value); ---- kernel-maemo-2.6.28.test.orig/drivers/pci/intel-iommu.c -+++ kernel-maemo-2.6.28.test/drivers/pci/intel-iommu.c +--- kernel-power-2.6.28.orig/drivers/pci/intel-iommu.c ++++ kernel-power-2.6.28/drivers/pci/intel-iommu.c @@ -71,6 +71,8 @@ /* bitmap for indexing intel_iommus */ static int g_num_of_iommus; @@ -8121,8 +8121,8 @@ +} + +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf); ---- kernel-maemo-2.6.28.test.orig/drivers/pci/msi.c -+++ kernel-maemo-2.6.28.test/drivers/pci/msi.c +--- kernel-power-2.6.28.orig/drivers/pci/msi.c ++++ kernel-power-2.6.28/drivers/pci/msi.c @@ -378,21 +378,19 @@ entry->msi_attrib.masked = 1; entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */ @@ -8152,8 +8152,8 @@ entry->msi_attrib.maskbits_mask = temp; } list_add_tail(&entry->list, &dev->msi_list); ---- kernel-maemo-2.6.28.test.orig/drivers/pci/pci-sysfs.c -+++ kernel-maemo-2.6.28.test/drivers/pci/pci-sysfs.c +--- kernel-power-2.6.28.orig/drivers/pci/pci-sysfs.c ++++ kernel-power-2.6.28/drivers/pci/pci-sysfs.c @@ -777,8 +777,8 @@ return -EINVAL; @@ -8165,8 +8165,8 @@ if (off >= size) count = 0; ---- kernel-maemo-2.6.28.test.orig/drivers/pci/pcie/aer/aerdrv_core.c -+++ kernel-maemo-2.6.28.test/drivers/pci/pcie/aer/aerdrv_core.c +--- kernel-power-2.6.28.orig/drivers/pci/pcie/aer/aerdrv_core.c ++++ kernel-power-2.6.28/drivers/pci/pcie/aer/aerdrv_core.c @@ -108,6 +108,34 @@ } #endif /* 0 */ @@ -8236,8 +8236,8 @@ pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR); /* Disable Root's interrupt in response to error messages */ pci_write_config_dword(pdev, pos + PCI_ERR_ROOT_COMMAND, 0); ---- kernel-maemo-2.6.28.test.orig/drivers/pci/pcie/aspm.c -+++ kernel-maemo-2.6.28.test/drivers/pci/pcie/aspm.c +--- kernel-power-2.6.28.orig/drivers/pci/pcie/aspm.c ++++ kernel-power-2.6.28/drivers/pci/pcie/aspm.c @@ -33,6 +33,11 @@ struct pcie_link_state { struct list_head sibiling; @@ -8463,8 +8463,8 @@ /* Clock PM is for endpoint device */ free_link_state(parent); ---- kernel-maemo-2.6.28.test.orig/drivers/pci/pcie/portdrv_pci.c -+++ kernel-maemo-2.6.28.test/drivers/pci/pcie/portdrv_pci.c +--- kernel-power-2.6.28.orig/drivers/pci/pcie/portdrv_pci.c ++++ kernel-power-2.6.28/drivers/pci/pcie/portdrv_pci.c @@ -101,14 +101,13 @@ pcie_portdrv_save_config(dev); @@ -8481,8 +8481,8 @@ kfree(pci_get_drvdata(dev)); } ---- kernel-maemo-2.6.28.test.orig/drivers/pci/quirks.c -+++ kernel-maemo-2.6.28.test/drivers/pci/quirks.c +--- kernel-power-2.6.28.orig/drivers/pci/quirks.c ++++ kernel-power-2.6.28/drivers/pci/quirks.c @@ -23,6 +23,7 @@ #include #include @@ -8540,8 +8540,8 @@ /* The P5N32-SLI Premium motherboard from Asus has a problem with msi * for the MCP55 NIC. It is not yet determined whether the msi problem * also affects other devices. As for now, turn off msi for this device. ---- kernel-maemo-2.6.28.test.orig/drivers/pci/rom.c -+++ kernel-maemo-2.6.28.test/drivers/pci/rom.c +--- kernel-power-2.6.28.orig/drivers/pci/rom.c ++++ kernel-power-2.6.28/drivers/pci/rom.c @@ -63,7 +63,7 @@ * The PCI window size could be much larger than the * actual image size. @@ -8572,8 +8572,8 @@ return rom; } ---- kernel-maemo-2.6.28.test.orig/drivers/pci/syscall.c -+++ kernel-maemo-2.6.28.test/drivers/pci/syscall.c +--- kernel-power-2.6.28.orig/drivers/pci/syscall.c ++++ kernel-power-2.6.28/drivers/pci/syscall.c @@ -14,10 +14,8 @@ #include #include "pci.h" @@ -8600,8 +8600,8 @@ { struct pci_dev *dev; u8 byte; ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/eata.c -+++ kernel-maemo-2.6.28.test/drivers/scsi/eata.c +--- kernel-power-2.6.28.orig/drivers/scsi/eata.c ++++ kernel-power-2.6.28/drivers/scsi/eata.c @@ -1626,8 +1626,15 @@ cpp->sense_len = SCSI_SENSE_BUFFERSIZE; @@ -8631,8 +8631,8 @@ if (!DEV2H(cpp->data_len)) pci_dir = PCI_DMA_BIDIRECTIONAL; ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/hptiop.c -+++ kernel-maemo-2.6.28.test/drivers/scsi/hptiop.c +--- kernel-power-2.6.28.orig/drivers/scsi/hptiop.c ++++ kernel-power-2.6.28/drivers/scsi/hptiop.c @@ -1251,6 +1251,7 @@ { PCI_VDEVICE(TTI, 0x3530), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x3560), (kernel_ulong_t)&hptiop_itl_ops }, @@ -8641,8 +8641,8 @@ { PCI_VDEVICE(TTI, 0x4210), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x4211), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x4310), (kernel_ulong_t)&hptiop_itl_ops }, ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/ibmvscsi/ibmvfc.c -+++ kernel-maemo-2.6.28.test/drivers/scsi/ibmvscsi/ibmvfc.c +--- kernel-power-2.6.28.orig/drivers/scsi/ibmvscsi/ibmvfc.c ++++ kernel-power-2.6.28/drivers/scsi/ibmvscsi/ibmvfc.c @@ -566,7 +566,7 @@ struct ibmvfc_target *tgt; @@ -8712,8 +8712,8 @@ break; case IBMVFC_HOST_ACTION_QUERY: list_for_each_entry(tgt, &vhost->targets, queue) ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/ibmvscsi/ibmvfc.h -+++ kernel-maemo-2.6.28.test/drivers/scsi/ibmvscsi/ibmvfc.h +--- kernel-power-2.6.28.orig/drivers/scsi/ibmvscsi/ibmvfc.h ++++ kernel-power-2.6.28/drivers/scsi/ibmvscsi/ibmvfc.h @@ -33,7 +33,7 @@ #define IBMVFC_DRIVER_DATE "(August 14, 2008)" @@ -8741,8 +8741,8 @@ int events_to_log; #define IBMVFC_AE_LINKUP 0x0001 #define IBMVFC_AE_LINKDOWN 0x0002 ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/libiscsi.c -+++ kernel-maemo-2.6.28.test/drivers/scsi/libiscsi.c +--- kernel-power-2.6.28.orig/drivers/scsi/libiscsi.c ++++ kernel-power-2.6.28/drivers/scsi/libiscsi.c @@ -1862,12 +1862,14 @@ num_arrays++; q->pool = kzalloc(num_arrays * max * sizeof(void*), GFP_KERNEL); @@ -8771,8 +8771,8 @@ } EXPORT_SYMBOL_GPL(iscsi_pool_free); ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/mvsas.c -+++ kernel-maemo-2.6.28.test/drivers/scsi/mvsas.c +--- kernel-power-2.6.28.orig/drivers/scsi/mvsas.c ++++ kernel-power-2.6.28/drivers/scsi/mvsas.c @@ -2959,7 +2959,7 @@ /* enable auto port detection */ @@ -8782,8 +8782,8 @@ /* init and reset phys */ for (i = 0; i < mvi->chip->n_phy; i++) { u32 lo = be32_to_cpu(*(u32 *)&mvi->sas_addr[4]); ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/pcmcia/aha152x_stub.c -+++ kernel-maemo-2.6.28.test/drivers/scsi/pcmcia/aha152x_stub.c +--- kernel-power-2.6.28.orig/drivers/scsi/pcmcia/aha152x_stub.c ++++ kernel-power-2.6.28/drivers/scsi/pcmcia/aha152x_stub.c @@ -114,7 +114,7 @@ link->io.NumPorts1 = 0x20; link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; @@ -8793,8 +8793,8 @@ link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/sd.c -+++ kernel-maemo-2.6.28.test/drivers/scsi/sd.c +--- kernel-power-2.6.28.orig/drivers/scsi/sd.c ++++ kernel-power-2.6.28/drivers/scsi/sd.c @@ -106,6 +106,7 @@ static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *); static void sd_print_result(struct scsi_disk *, int); @@ -8833,8 +8833,8 @@ disk->private_data = NULL; put_disk(disk); ---- kernel-maemo-2.6.28.test.orig/drivers/scsi/sg.c -+++ kernel-maemo-2.6.28.test/drivers/scsi/sg.c +--- kernel-power-2.6.28.orig/drivers/scsi/sg.c ++++ kernel-power-2.6.28/drivers/scsi/sg.c @@ -101,6 +101,7 @@ #define SG_SECTOR_MSK (SG_SECTOR_SZ - 1) @@ -9641,8 +9641,8 @@ return 0; } ---- kernel-maemo-2.6.28.test.orig/drivers/serial/8250.c -+++ kernel-maemo-2.6.28.test/drivers/serial/8250.c +--- kernel-power-2.6.28.orig/drivers/serial/8250.c ++++ kernel-power-2.6.28/drivers/serial/8250.c @@ -2028,6 +2028,20 @@ serial8250_set_mctrl(&up->port, up->port.mctrl); @@ -9672,8 +9672,8 @@ spin_unlock_irqrestore(&up->port.lock, flags); /* ---- kernel-maemo-2.6.28.test.orig/drivers/serial/8250_pci.c -+++ kernel-maemo-2.6.28.test/drivers/serial/8250_pci.c +--- kernel-power-2.6.28.orig/drivers/serial/8250_pci.c ++++ kernel-power-2.6.28/drivers/serial/8250_pci.c @@ -758,6 +758,21 @@ return setup_port(priv, port, bar, offset, board->reg_shift); } @@ -9764,8 +9764,8 @@ PCI_ANY_ID, PCI_ANY_ID, 0, 0, pbn_b0_2_1130000 }, { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954, ---- kernel-maemo-2.6.28.test.orig/drivers/serial/jsm/jsm_driver.c -+++ kernel-maemo-2.6.28.test/drivers/serial/jsm/jsm_driver.c +--- kernel-power-2.6.28.orig/drivers/serial/jsm/jsm_driver.c ++++ kernel-power-2.6.28/drivers/serial/jsm/jsm_driver.c @@ -84,6 +84,8 @@ brd->pci_dev = pdev; if (pdev->device == PCIE_DEVICE_ID_NEO_4_IBM) @@ -9783,8 +9783,8 @@ { 0, } }; MODULE_DEVICE_TABLE(pci, jsm_pci_tbl); ---- kernel-maemo-2.6.28.test.orig/drivers/serial/jsm/jsm_tty.c -+++ kernel-maemo-2.6.28.test/drivers/serial/jsm/jsm_tty.c +--- kernel-power-2.6.28.orig/drivers/serial/jsm/jsm_tty.c ++++ kernel-power-2.6.28/drivers/serial/jsm/jsm_tty.c @@ -161,6 +161,11 @@ channel->ch_bd->bd_ops->disable_receiver(channel); } @@ -9805,8 +9805,8 @@ .break_ctl = jsm_tty_break, .startup = jsm_tty_open, .shutdown = jsm_tty_close, ---- kernel-maemo-2.6.28.test.orig/drivers/spi/spi.c -+++ kernel-maemo-2.6.28.test/drivers/spi/spi.c +--- kernel-power-2.6.28.orig/drivers/spi/spi.c ++++ kernel-power-2.6.28/drivers/spi/spi.c @@ -660,7 +660,7 @@ int status; @@ -9855,8 +9855,8 @@ mutex_unlock(&lock); else kfree(local_buf); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/class/cdc-acm.c -+++ kernel-maemo-2.6.28.test/drivers/usb/class/cdc-acm.c +--- kernel-power-2.6.28.orig/drivers/usb/class/cdc-acm.c ++++ kernel-power-2.6.28/drivers/usb/class/cdc-acm.c @@ -1370,6 +1370,8 @@ { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ @@ -9866,8 +9866,8 @@ /* control interfaces with various AT-command sets */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, ---- kernel-maemo-2.6.28.test.orig/drivers/usb/class/cdc-wdm.c -+++ kernel-maemo-2.6.28.test/drivers/usb/class/cdc-wdm.c +--- kernel-power-2.6.28.orig/drivers/usb/class/cdc-wdm.c ++++ kernel-power-2.6.28/drivers/usb/class/cdc-wdm.c @@ -652,7 +652,7 @@ iface = &intf->altsetting[0]; @@ -9877,8 +9877,8 @@ rv = -EINVAL; goto err; } ---- kernel-maemo-2.6.28.test.orig/drivers/usb/class/usbtmc.c -+++ kernel-maemo-2.6.28.test/drivers/usb/class/usbtmc.c +--- kernel-power-2.6.28.orig/drivers/usb/class/usbtmc.c ++++ kernel-power-2.6.28/drivers/usb/class/usbtmc.c @@ -49,6 +49,7 @@ static struct usb_device_id usbtmc_devices[] = { @@ -9902,8 +9902,8 @@ goto exit; } ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/devio.c -+++ kernel-maemo-2.6.28.test/drivers/usb/core/devio.c +--- kernel-power-2.6.28.orig/drivers/usb/core/devio.c ++++ kernel-power-2.6.28/drivers/usb/core/devio.c @@ -359,11 +359,6 @@ spin_lock_irqsave(&ps->lock, flags); } @@ -10003,8 +10003,8 @@ class_destroy(usb_classdev_class); #endif cdev_del(&usb_device_cdev); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/driver.c -+++ kernel-maemo-2.6.28.test/drivers/usb/core/driver.c +--- kernel-power-2.6.28.orig/drivers/usb/core/driver.c ++++ kernel-power-2.6.28/drivers/usb/core/driver.c @@ -269,7 +269,7 @@ * supports "soft" unbinding. */ @@ -10030,8 +10030,8 @@ usb_set_interface(udev, intf->altsetting[0]. desc.bInterfaceNumber, 0); else ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/hub.c -+++ kernel-maemo-2.6.28.test/drivers/usb/core/hub.c +--- kernel-power-2.6.28.orig/drivers/usb/core/hub.c ++++ kernel-power-2.6.28/drivers/usb/core/hub.c @@ -2383,9 +2383,9 @@ void usb_ep0_reinit(struct usb_device *udev) @@ -10045,8 +10045,8 @@ } EXPORT_SYMBOL_GPL(usb_ep0_reinit); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/inode.c -+++ kernel-maemo-2.6.28.test/drivers/usb/core/inode.c +--- kernel-power-2.6.28.orig/drivers/usb/core/inode.c ++++ kernel-power-2.6.28/drivers/usb/core/inode.c @@ -718,7 +718,6 @@ fs_remove_file (dev->usbfs_dentry); dev->usbfs_dentry = NULL; @@ -10055,8 +10055,8 @@ } static int usbfs_notify(struct notifier_block *self, unsigned long action, void *dev) ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/message.c -+++ kernel-maemo-2.6.28.test/drivers/usb/core/message.c +--- kernel-power-2.6.28.orig/drivers/usb/core/message.c ++++ kernel-power-2.6.28/drivers/usb/core/message.c @@ -651,7 +651,7 @@ if (result <= 0 && result != -ETIMEDOUT) continue; @@ -10271,8 +10271,8 @@ cp->string = usb_cache_string(dev, cp->desc.iConfiguration); /* Now that all the interfaces are set up, register them ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/quirks.c -+++ kernel-maemo-2.6.28.test/drivers/usb/core/quirks.c +--- kernel-power-2.6.28.orig/drivers/usb/core/quirks.c ++++ kernel-power-2.6.28/drivers/usb/core/quirks.c @@ -54,6 +54,10 @@ { USB_DEVICE(0x0638, 0x0a13), .driver_info = USB_QUIRK_STRING_FETCH_255 }, @@ -10284,8 +10284,8 @@ /* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/sysfs.c -+++ kernel-maemo-2.6.28.test/drivers/usb/core/sysfs.c +--- kernel-power-2.6.28.orig/drivers/usb/core/sysfs.c ++++ kernel-power-2.6.28/drivers/usb/core/sysfs.c @@ -13,6 +13,7 @@ #include #include @@ -10304,8 +10304,8 @@ alt->string = usb_cache_string(udev, alt->desc.iInterface); if (alt->string) retval = device_create_file(&intf->dev, &dev_attr_interface); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/usb.c -+++ kernel-maemo-2.6.28.test/drivers/usb/core/usb.c +--- kernel-power-2.6.28.orig/drivers/usb/core/usb.c ++++ kernel-power-2.6.28/drivers/usb/core/usb.c @@ -362,7 +362,7 @@ dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE; dev->ep0.desc.bDescriptorType = USB_DT_ENDPOINT; @@ -10315,8 +10315,8 @@ dev->can_submit = 1; /* Save readable and stable topology id, distinguishing devices ---- kernel-maemo-2.6.28.test.orig/drivers/usb/core/usb.h -+++ kernel-maemo-2.6.28.test/drivers/usb/core/usb.h +--- kernel-power-2.6.28.orig/drivers/usb/core/usb.h ++++ kernel-power-2.6.28/drivers/usb/core/usb.h @@ -10,10 +10,13 @@ extern void usb_remove_ep_files(struct usb_host_endpoint *endpoint); @@ -10342,8 +10342,8 @@ extern int usb_devio_init(void); extern void usb_devio_cleanup(void); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/gadget/f_rndis.c -+++ kernel-maemo-2.6.28.test/drivers/usb/gadget/f_rndis.c +--- kernel-power-2.6.28.orig/drivers/usb/gadget/f_rndis.c ++++ kernel-power-2.6.28/drivers/usb/gadget/f_rndis.c @@ -437,7 +437,7 @@ DBG(cdev, "rndis req%02x.%02x v%04x i%04x l%d\n", ctrl->bRequestType, ctrl->bRequest, @@ -10353,8 +10353,8 @@ req->length = value; value = usb_ep_queue(cdev->gadget->ep0, req, GFP_ATOMIC); if (value < 0) ---- kernel-maemo-2.6.28.test.orig/drivers/usb/gadget/u_ether.c -+++ kernel-maemo-2.6.28.test/drivers/usb/gadget/u_ether.c +--- kernel-power-2.6.28.orig/drivers/usb/gadget/u_ether.c ++++ kernel-power-2.6.28/drivers/usb/gadget/u_ether.c @@ -174,12 +174,6 @@ strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info); } @@ -10377,8 +10377,8 @@ }; static void defer_kevent(struct eth_dev *dev, int flag) ---- kernel-maemo-2.6.28.test.orig/drivers/usb/host/ehci-hcd.c -+++ kernel-maemo-2.6.28.test/drivers/usb/host/ehci-hcd.c +--- kernel-power-2.6.28.orig/drivers/usb/host/ehci-hcd.c ++++ kernel-power-2.6.28/drivers/usb/host/ehci-hcd.c @@ -485,6 +485,7 @@ * periodic_size can shrink by USBCMD update if hcc_params allows. */ @@ -10395,8 +10395,8 @@ /* * dedicate a qh for the async ring head, since we couldn't unlink ---- kernel-maemo-2.6.28.test.orig/drivers/usb/host/ehci-mem.c -+++ kernel-maemo-2.6.28.test/drivers/usb/host/ehci-mem.c +--- kernel-power-2.6.28.orig/drivers/usb/host/ehci-mem.c ++++ kernel-power-2.6.28/drivers/usb/host/ehci-mem.c @@ -128,6 +128,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci) @@ -10405,8 +10405,8 @@ if (ehci->async) qh_put (ehci->async); ehci->async = NULL; ---- kernel-maemo-2.6.28.test.orig/drivers/usb/host/ehci-q.c -+++ kernel-maemo-2.6.28.test/drivers/usb/host/ehci-q.c +--- kernel-power-2.6.28.orig/drivers/usb/host/ehci-q.c ++++ kernel-power-2.6.28/drivers/usb/host/ehci-q.c @@ -333,12 +333,40 @@ token = hc32_to_cpu(ehci, qtd->hw_token); @@ -10476,8 +10476,8 @@ /* if (unlikely (qh->reclaim != 0)) * this will recurse, probably not much */ ---- kernel-maemo-2.6.28.test.orig/drivers/usb/host/ehci-sched.c -+++ kernel-maemo-2.6.28.test/drivers/usb/host/ehci-sched.c +--- kernel-power-2.6.28.orig/drivers/usb/host/ehci-sched.c ++++ kernel-power-2.6.28/drivers/usb/host/ehci-sched.c @@ -1004,7 +1004,8 @@ is_in = (stream->bEndpointAddress & USB_DIR_IN) ? 0x10 : 0; @@ -10618,8 +10618,8 @@ } else { now_uframe++; now_uframe %= mod; ---- kernel-maemo-2.6.28.test.orig/drivers/usb/host/ehci.h -+++ kernel-maemo-2.6.28.test/drivers/usb/host/ehci.h +--- kernel-power-2.6.28.orig/drivers/usb/host/ehci.h ++++ kernel-power-2.6.28/drivers/usb/host/ehci.h @@ -87,6 +87,10 @@ int next_uframe; /* scan periodic, start here */ unsigned periodic_sched; /* periodic activity count */ @@ -10650,8 +10650,8 @@ /* periodic schedule info */ u8 usecs; /* intr bandwidth */ u8 gap_uf; /* uframes split/csplit gap */ ---- kernel-maemo-2.6.28.test.orig/drivers/usb/host/isp1760-if.c -+++ kernel-maemo-2.6.28.test/drivers/usb/host/isp1760-if.c +--- kernel-power-2.6.28.orig/drivers/usb/host/isp1760-if.c ++++ kernel-power-2.6.28/drivers/usb/host/isp1760-if.c @@ -129,23 +129,23 @@ #endif @@ -10834,8 +10834,8 @@ }; MODULE_DEVICE_TABLE(pci, isp1760_plx); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/misc/emi26.c -+++ kernel-maemo-2.6.28.test/drivers/usb/misc/emi26.c +--- kernel-power-2.6.28.orig/drivers/usb/misc/emi26.c ++++ kernel-power-2.6.28/drivers/usb/misc/emi26.c @@ -160,7 +160,7 @@ err("%s - error loading firmware: error = %d", __func__, err); goto wraperr; @@ -10845,8 +10845,8 @@ /* Assert reset (stop the CPU in the EMI) */ err = emi26_set_reset(dev,1); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/mon/mon_bin.c -+++ kernel-maemo-2.6.28.test/drivers/usb/mon/mon_bin.c +--- kernel-power-2.6.28.orig/drivers/usb/mon/mon_bin.c ++++ kernel-power-2.6.28/drivers/usb/mon/mon_bin.c @@ -37,6 +37,7 @@ #define MON_IOCX_GET _IOW(MON_IOC_MAGIC, 6, struct mon_bin_get) #define MON_IOCX_MFETCH _IOWR(MON_IOC_MAGIC, 7, struct mon_bin_mfetch) @@ -10995,8 +10995,8 @@ .release = mon_bin_release, .mmap = mon_bin_mmap, }; ---- kernel-maemo-2.6.28.test.orig/drivers/usb/serial/cp2101.c -+++ kernel-maemo-2.6.28.test/drivers/usb/serial/cp2101.c +--- kernel-power-2.6.28.orig/drivers/usb/serial/cp2101.c ++++ kernel-power-2.6.28/drivers/usb/serial/cp2101.c @@ -79,6 +79,7 @@ { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ @@ -11005,8 +11005,8 @@ { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ ---- kernel-maemo-2.6.28.test.orig/drivers/usb/serial/ftdi_sio.c -+++ kernel-maemo-2.6.28.test/drivers/usb/serial/ftdi_sio.c +--- kernel-power-2.6.28.orig/drivers/usb/serial/ftdi_sio.c ++++ kernel-power-2.6.28/drivers/usb/serial/ftdi_sio.c @@ -660,6 +660,12 @@ { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) }, { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) }, @@ -11020,8 +11020,8 @@ { }, /* Optional parameter entry */ { } /* Terminating entry */ }; ---- kernel-maemo-2.6.28.test.orig/drivers/usb/serial/ftdi_sio.h -+++ kernel-maemo-2.6.28.test/drivers/usb/serial/ftdi_sio.h +--- kernel-power-2.6.28.orig/drivers/usb/serial/ftdi_sio.h ++++ kernel-power-2.6.28/drivers/usb/serial/ftdi_sio.h @@ -881,6 +881,33 @@ #define RATOC_PRODUCT_ID_USB60F 0xb020 @@ -11056,8 +11056,8 @@ * BmRequestType: 1100 0000b * bRequest: FTDI_E2_READ * wValue: 0 ---- kernel-maemo-2.6.28.test.orig/drivers/usb/serial/option.c -+++ kernel-maemo-2.6.28.test/drivers/usb/serial/option.c +--- kernel-power-2.6.28.orig/drivers/usb/serial/option.c ++++ kernel-power-2.6.28/drivers/usb/serial/option.c @@ -89,6 +89,7 @@ #define OPTION_PRODUCT_ETNA_MODEM_GT 0x7041 #define OPTION_PRODUCT_ETNA_MODEM_EX 0x7061 @@ -11227,8 +11227,8 @@ { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, option_ids); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/serial/ti_usb_3410_5052.c -+++ kernel-maemo-2.6.28.test/drivers/usb/serial/ti_usb_3410_5052.c +--- kernel-power-2.6.28.orig/drivers/usb/serial/ti_usb_3410_5052.c ++++ kernel-power-2.6.28/drivers/usb/serial/ti_usb_3410_5052.c @@ -176,25 +176,32 @@ /* the array dimension is the number of default entries plus */ /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */ @@ -11265,8 +11265,8 @@ { } }; ---- kernel-maemo-2.6.28.test.orig/drivers/usb/serial/ti_usb_3410_5052.h -+++ kernel-maemo-2.6.28.test/drivers/usb/serial/ti_usb_3410_5052.h +--- kernel-power-2.6.28.orig/drivers/usb/serial/ti_usb_3410_5052.h ++++ kernel-power-2.6.28/drivers/usb/serial/ti_usb_3410_5052.h @@ -27,7 +27,11 @@ /* Vendor and product ids */ @@ -11279,8 +11279,8 @@ #define TI_3410_EZ430_ID 0xF430 /* TI ez430 development tool */ #define TI_5052_BOOT_PRODUCT_ID 0x5052 /* no EEPROM, no firmware */ #define TI_5152_BOOT_PRODUCT_ID 0x5152 /* no EEPROM, no firmware */ ---- kernel-maemo-2.6.28.test.orig/drivers/usb/storage/cypress_atacb.c -+++ kernel-maemo-2.6.28.test/drivers/usb/storage/cypress_atacb.c +--- kernel-power-2.6.28.orig/drivers/usb/storage/cypress_atacb.c ++++ kernel-power-2.6.28/drivers/usb/storage/cypress_atacb.c @@ -133,19 +133,18 @@ /* build the command for @@ -11317,8 +11317,8 @@ */ /* Sense data is current and format is descriptor. */ ---- kernel-maemo-2.6.28.test.orig/drivers/usb/storage/libusual.c -+++ kernel-maemo-2.6.28.test/drivers/usb/storage/libusual.c +--- kernel-power-2.6.28.orig/drivers/usb/storage/libusual.c ++++ kernel-power-2.6.28/drivers/usb/storage/libusual.c @@ -46,6 +46,12 @@ { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \ .driver_info = (flags)|(USB_US_TYPE_STOR<<24) } @@ -11340,8 +11340,8 @@ MODULE_DEVICE_TABLE(usb, storage_usb_ids); EXPORT_SYMBOL_GPL(storage_usb_ids); ---- kernel-maemo-2.6.28.test.orig/drivers/usb/storage/scsiglue.c -+++ kernel-maemo-2.6.28.test/drivers/usb/storage/scsiglue.c +--- kernel-power-2.6.28.orig/drivers/usb/storage/scsiglue.c ++++ kernel-power-2.6.28/drivers/usb/storage/scsiglue.c @@ -59,6 +59,14 @@ #include "transport.h" #include "protocol.h" @@ -11409,8 +11409,8 @@ } else { /* Non-disk-type devices don't need to blacklist any pages ---- kernel-maemo-2.6.28.test.orig/drivers/usb/storage/transport.c -+++ kernel-maemo-2.6.28.test/drivers/usb/storage/transport.c +--- kernel-power-2.6.28.orig/drivers/usb/storage/transport.c ++++ kernel-power-2.6.28/drivers/usb/storage/transport.c @@ -57,6 +57,9 @@ #include "scsiglue.h" #include "debug.h" @@ -11526,8 +11526,8 @@ } /* Stop the current URB transfer */ ---- kernel-maemo-2.6.28.test.orig/drivers/usb/storage/unusual_devs.h -+++ kernel-maemo-2.6.28.test/drivers/usb/storage/unusual_devs.h +--- kernel-power-2.6.28.orig/drivers/usb/storage/unusual_devs.h ++++ kernel-power-2.6.28/drivers/usb/storage/unusual_devs.h @@ -27,7 +27,8 @@ /* IMPORTANT NOTE: This file must be included in another file which does @@ -11868,8 +11868,8 @@ * Patch by Constantin Baranov * Report by Andreas Koenecke. * Motorola ROKR Z6. ---- kernel-maemo-2.6.28.test.orig/drivers/usb/storage/usb.c -+++ kernel-maemo-2.6.28.test/drivers/usb/storage/usb.c +--- kernel-power-2.6.28.orig/drivers/usb/storage/usb.c ++++ kernel-power-2.6.28/drivers/usb/storage/usb.c @@ -126,6 +126,8 @@ { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \ .driver_info = (flags)|(USB_US_TYPE_STOR<<24) } @@ -11904,8 +11904,8 @@ # undef USUAL_DEV /* Terminating entry */ ---- kernel-maemo-2.6.28.test.orig/drivers/usb/storage/usb.h -+++ kernel-maemo-2.6.28.test/drivers/usb/storage/usb.h +--- kernel-power-2.6.28.orig/drivers/usb/storage/usb.h ++++ kernel-power-2.6.28/drivers/usb/storage/usb.h @@ -155,6 +155,10 @@ #ifdef CONFIG_PM pm_hook suspend_resume_hook; @@ -11917,8 +11917,8 @@ }; /* Convert between us_data and the corresponding Scsi_Host */ ---- kernel-maemo-2.6.28.test.orig/drivers/video/aty/mach64_ct.c -+++ kernel-maemo-2.6.28.test/drivers/video/aty/mach64_ct.c +--- kernel-power-2.6.28.orig/drivers/video/aty/mach64_ct.c ++++ kernel-power-2.6.28/drivers/video/aty/mach64_ct.c @@ -8,6 +8,9 @@ #include #include