From 4b55bd06b446f18b4e6ed7b73a22d2e2f2d5233c Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Fri, 6 Feb 2009 11:10:27 +1100 Subject: [PATCH] --- yaml --- r: 131214 b: refs/heads/master c: e2a02ba6676cdc5ebec503b558838c08c7083c14 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/.mailmap | 4 +- trunk/Documentation/cpu-freq/user-guide.txt | 16 + trunk/Documentation/filesystems/sysfs-pci.txt | 13 +- trunk/MAINTAINERS | 11 +- trunk/Makefile | 2 +- trunk/arch/alpha/include/asm/bug.h | 4 +- trunk/arch/frv/mm/dma-alloc.c | 2 +- trunk/arch/ia64/sn/kernel/io_acpi_init.c | 2 +- trunk/arch/ia64/sn/kernel/io_init.c | 2 +- trunk/arch/mips/include/asm/spinlock.h | 1 - trunk/arch/powerpc/sysdev/ipic.c | 2 +- trunk/arch/sh/boards/board-ap325rxa.c | 63 +- trunk/arch/sh/configs/ap325rxa_defconfig | 27 +- trunk/arch/sh/configs/migor_defconfig | 42 +- trunk/arch/sh/include/asm/mutex-llsc.h | 21 +- trunk/arch/sh/include/asm/syscall_32.h | 22 +- trunk/arch/sh/include/asm/syscall_64.h | 22 +- trunk/arch/sh/kernel/cpu/sh4/fpu.c | 2 +- trunk/arch/sh/kernel/setup.c | 8 +- trunk/arch/sh/kernel/signal_32.c | 4 +- trunk/arch/sh/kernel/signal_64.c | 4 +- trunk/arch/sh/lib/checksum.S | 69 +- trunk/arch/sparc/kernel/head_64.S | 31 +- trunk/arch/sparc/kernel/nmi.c | 1 - trunk/arch/sparc/kernel/pcr.c | 7 +- trunk/arch/sparc/lib/GENbzero.S | 6 +- trunk/arch/sparc/lib/GENcopy_from_user.S | 8 +- trunk/arch/sparc/lib/GENcopy_to_user.S | 8 +- trunk/arch/sparc/lib/NG2copy_from_user.S | 9 +- trunk/arch/sparc/lib/NG2copy_to_user.S | 9 +- trunk/arch/sparc/lib/NGbzero.S | 6 +- trunk/arch/sparc/lib/NGcopy_from_user.S | 9 +- trunk/arch/sparc/lib/NGcopy_to_user.S | 9 +- trunk/arch/sparc/lib/U1copy_from_user.S | 8 +- trunk/arch/sparc/lib/U1copy_to_user.S | 8 +- trunk/arch/sparc/lib/U3copy_from_user.S | 6 +- trunk/arch/sparc/lib/U3copy_to_user.S | 8 +- trunk/arch/sparc/lib/bzero.S | 6 +- trunk/arch/sparc/lib/copy_in_user.S | 61 +- trunk/arch/x86/ia32/ia32entry.S | 8 +- trunk/arch/x86/include/asm/paravirt.h | 1 - trunk/arch/x86/include/asm/spinlock.h | 1 - trunk/arch/x86/kernel/acpi/sleep.c | 4 +- trunk/arch/x86/kernel/apic.c | 2 +- trunk/arch/x86/kernel/cpu/cpufreq/Kconfig | 11 + .../arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 28 +- trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 15 - trunk/arch/x86/kernel/entry_64.S | 1 - trunk/arch/x86/kernel/io_apic.c | 5 +- trunk/arch/x86/kernel/irqinit_32.c | 12 + trunk/arch/x86/mach-default/setup.c | 12 - trunk/arch/x86/mach-voyager/setup.c | 12 +- trunk/arch/x86/mach-voyager/voyager_smp.c | 25 +- trunk/arch/x86/mm/fault.c | 8 +- trunk/arch/x86/xen/multicalls.h | 4 +- trunk/crypto/algapi.c | 6 +- trunk/crypto/api.c | 20 +- trunk/crypto/scatterwalk.c | 3 +- trunk/crypto/shash.c | 7 +- trunk/drivers/acpi/Kconfig | 3 +- trunk/drivers/acpi/acpica/tbutils.c | 7 +- trunk/drivers/acpi/acpica/uteval.c | 21 +- trunk/drivers/acpi/container.c | 5 +- trunk/drivers/acpi/dock.c | 14 +- trunk/drivers/acpi/ec.c | 2 +- trunk/drivers/acpi/glue.c | 8 +- trunk/drivers/acpi/osl.c | 54 +- trunk/drivers/acpi/pci_link.c | 2 +- trunk/drivers/acpi/processor_idle.c | 667 ++- trunk/drivers/acpi/processor_perflib.c | 105 + trunk/drivers/acpi/sleep.c | 53 +- trunk/drivers/acpi/tables.c | 7 +- trunk/drivers/acpi/video.c | 16 +- trunk/drivers/atm/solos-pci.c | 1 - trunk/drivers/char/sx.c | 8 +- trunk/drivers/cpufreq/cpufreq_ondemand.c | 47 +- trunk/drivers/firewire/fw-card.c | 9 +- trunk/drivers/gpu/drm/Kconfig | 2 +- trunk/drivers/gpu/drm/drm_irq.c | 1 - trunk/drivers/gpu/drm/drm_memory.c | 7 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 47 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 1 + trunk/drivers/gpu/drm/i915/i915_drv.h | 8 - trunk/drivers/gpu/drm/i915/i915_gem.c | 83 +- trunk/drivers/gpu/drm/i915/i915_gem_tiling.c | 91 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 13 - trunk/drivers/gpu/drm/i915/i915_reg.h | 10 +- trunk/drivers/gpu/drm/i915/intel_display.c | 20 +- trunk/drivers/gpu/drm/i915/intel_drv.h | 1 - trunk/drivers/gpu/drm/i915/intel_lvds.c | 49 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 870 +-- trunk/drivers/gpu/drm/i915/intel_sdvo_regs.h | 404 +- trunk/drivers/gpu/drm/radeon/radeon_cp.c | 6 +- trunk/drivers/hwmon/hp_accel.c | 9 +- trunk/drivers/ieee1394/dv1394.c | 8 +- trunk/drivers/isdn/hardware/mISDN/hfcmulti.c | 2 - trunk/drivers/md/linear.c | 6 +- trunk/drivers/md/md.c | 24 +- trunk/drivers/md/raid1.c | 3 +- trunk/drivers/misc/Kconfig | 1 - trunk/drivers/misc/atmel-ssc.c | 2 +- trunk/drivers/misc/hpilo.c | 6 +- trunk/drivers/misc/hpilo.h | 2 - trunk/drivers/misc/sgi-xp/xpc.h | 5 +- trunk/drivers/misc/sgi-xp/xpc_uv.c | 11 +- trunk/drivers/net/3c509.c | 1 - trunk/drivers/net/cxgb3/sge.c | 3 +- trunk/drivers/net/gianfar.c | 9 - trunk/drivers/net/gianfar.h | 2 +- trunk/drivers/net/netxen/netxen_nic.h | 2 +- trunk/drivers/net/netxen/netxen_nic_main.c | 13 +- trunk/drivers/net/r8169.c | 93 +- trunk/drivers/net/sungem.c | 8 +- trunk/drivers/net/sunhme.c | 12 +- trunk/drivers/net/tulip/de2104x.c | 3 +- trunk/drivers/net/tun.c | 10 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 2 - trunk/drivers/net/wireless/iwlwifi/iwl-sta.c | 3 - .../net/wireless/iwlwifi/iwl3945-base.c | 2 - trunk/drivers/pci/pci-driver.c | 164 +- trunk/drivers/pci/pci-sysfs.c | 4 +- trunk/drivers/pci/pci.c | 4 +- trunk/drivers/pci/pcie/aspm.c | 4 +- trunk/drivers/pci/pcie/portdrv_pci.c | 16 +- trunk/drivers/pci/rom.c | 8 +- trunk/drivers/platform/x86/Kconfig | 1 - trunk/drivers/platform/x86/asus-laptop.c | 176 +- trunk/drivers/platform/x86/asus_acpi.c | 16 +- trunk/drivers/platform/x86/eeepc-laptop.c | 164 +- trunk/drivers/platform/x86/hp-wmi.c | 6 +- trunk/drivers/platform/x86/panasonic-laptop.c | 2 +- trunk/drivers/rtc/Kconfig | 6 - trunk/drivers/rtc/Makefile | 1 - trunk/drivers/rtc/rtc-dm355evm.c | 175 - trunk/drivers/rtc/rtc-ds1390.c | 1 + trunk/drivers/staging/android/Kconfig | 1 - trunk/drivers/staging/android/ram_console.c | 14 - trunk/drivers/staging/android/timed_gpio.c | 2 +- trunk/drivers/staging/at76_usb/Kconfig | 2 +- trunk/drivers/staging/at76_usb/at76_usb.c | 4754 ++++------------- trunk/drivers/staging/at76_usb/at76_usb.h | 227 +- trunk/drivers/staging/panel/panel.c | 10 +- trunk/drivers/usb/Makefile | 1 - trunk/drivers/usb/class/cdc-acm.c | 3 + trunk/drivers/usb/gadget/fsl_qe_udc.c | 46 +- trunk/drivers/usb/serial/aircable.c | 4 +- trunk/drivers/usb/serial/ftdi_sio.c | 5 +- trunk/drivers/usb/serial/ftdi_sio.h | 3 - trunk/drivers/usb/serial/option.c | 93 +- trunk/drivers/usb/serial/ti_usb_3410_5052.c | 10 +- trunk/drivers/usb/serial/ti_usb_3410_5052.h | 2 - trunk/drivers/usb/storage/scsiglue.c | 2 - trunk/drivers/usb/storage/transport.c | 36 +- trunk/drivers/usb/storage/unusual_devs.h | 17 +- trunk/drivers/video/Kconfig | 6 +- trunk/drivers/video/aty/aty128fb.c | 33 +- trunk/drivers/video/aty/atyfb_base.c | 42 +- trunk/drivers/video/aty/radeon_base.c | 10 +- trunk/drivers/video/aty/radeon_pm.c | 103 +- trunk/drivers/video/aty/radeonfb.h | 2 + trunk/drivers/video/backlight/Makefile | 2 +- .../video/backlight/{da903x_bl.c => da903x.c} | 0 trunk/drivers/video/fbcmap.c | 20 +- trunk/drivers/video/fbmem.c | 135 +- trunk/fs/binfmt_elf.c | 14 +- trunk/fs/btrfs/Kconfig | 13 - trunk/fs/btrfs/async-thread.c | 61 +- trunk/fs/btrfs/compression.c | 1 + trunk/fs/btrfs/ctree.c | 277 +- trunk/fs/btrfs/ctree.h | 28 +- trunk/fs/btrfs/disk-io.c | 120 +- trunk/fs/btrfs/disk-io.h | 2 - trunk/fs/btrfs/extent-tree.c | 438 +- trunk/fs/btrfs/extent_io.c | 132 +- trunk/fs/btrfs/extent_io.h | 18 +- trunk/fs/btrfs/extent_map.c | 1 + trunk/fs/btrfs/file.c | 5 +- trunk/fs/btrfs/inode.c | 84 +- trunk/fs/btrfs/ioctl.c | 1 + trunk/fs/btrfs/locking.c | 218 +- trunk/fs/btrfs/locking.h | 6 +- trunk/fs/btrfs/ordered-data.c | 4 +- trunk/fs/btrfs/ref-cache.c | 1 - trunk/fs/btrfs/ref-cache.h | 1 + trunk/fs/btrfs/super.c | 6 +- trunk/fs/btrfs/transaction.c | 4 +- trunk/fs/btrfs/tree-defrag.c | 1 - trunk/fs/btrfs/tree-log.c | 354 +- trunk/fs/btrfs/volumes.c | 49 +- trunk/fs/btrfs/xattr.c | 48 +- trunk/fs/btrfs/xattr.h | 2 - trunk/fs/buffer.c | 2 +- trunk/fs/compat.c | 2 +- trunk/fs/compat_ioctl.c | 2 +- trunk/fs/configfs/dir.c | 59 + trunk/fs/ecryptfs/crypto.c | 4 +- trunk/fs/exec.c | 28 +- trunk/fs/hugetlbfs/inode.c | 8 +- trunk/fs/internal.h | 2 +- trunk/fs/lockd/svclock.c | 6 +- trunk/fs/seq_file.c | 115 +- trunk/fs/super.c | 4 +- trunk/include/acpi/pdc_intel.h | 2 - trunk/include/crypto/hash.h | 2 +- trunk/include/drm/i915_drm.h | 2 - trunk/include/linux/async.h | 8 +- trunk/include/linux/crypto.h | 7 +- trunk/include/linux/dmaengine.h | 12 - trunk/include/linux/fb.h | 15 - trunk/include/linux/hugetlb.h | 5 +- trunk/include/linux/kernel.h | 3 +- trunk/include/linux/mm.h | 3 +- trunk/include/linux/module.h | 1 + trunk/include/linux/pci.h | 2 +- trunk/include/linux/sched.h | 1 - trunk/include/linux/spinlock.h | 5 - trunk/include/linux/wait.h | 11 +- trunk/include/video/aty128.h | 4 +- trunk/include/video/mach64.h | 24 +- trunk/include/video/radeon.h | 18 +- trunk/ipc/shm.c | 12 +- trunk/kernel/async.c | 94 +- trunk/kernel/fork.c | 1 - trunk/kernel/irq/numa_migrate.c | 7 +- trunk/kernel/power/main.c | 26 +- trunk/kernel/sched.c | 4 +- trunk/kernel/sys.c | 16 +- trunk/kernel/trace/ftrace.c | 5 - trunk/kernel/wait.c | 59 +- trunk/mm/fremap.c | 2 +- trunk/mm/hugetlb.c | 39 +- trunk/mm/memory.c | 2 +- trunk/mm/mlock.c | 5 +- trunk/mm/mmap.c | 38 +- trunk/mm/mprotect.c | 5 +- trunk/net/9p/protocol.c | 22 +- trunk/net/bridge/br_forward.c | 7 +- trunk/net/core/dev.c | 4 +- trunk/net/core/neighbour.c | 14 +- trunk/net/ipv4/tcp_output.c | 12 +- trunk/net/ipv4/udp.c | 9 +- trunk/net/ipv6/ip6_flowlabel.c | 8 +- trunk/net/ipv6/ip6_output.c | 67 +- trunk/net/ipv6/ip6_tunnel.c | 2 +- .../netfilter/nf_conntrack_proto_icmpv6.c | 25 +- trunk/net/netfilter/nf_conntrack_netlink.c | 15 +- trunk/net/netfilter/xt_sctp.c | 2 +- trunk/net/rxrpc/af_rxrpc.c | 5 +- trunk/sound/core/oss/pcm_oss.c | 2 +- trunk/sound/pci/hda/hda_codec.c | 9 +- trunk/sound/pci/hda/hda_codec.h | 1 - trunk/sound/pci/hda/hda_proc.c | 3 +- trunk/sound/pci/hda/patch_realtek.c | 5 - trunk/sound/pci/hda/patch_sigmatel.c | 2 - trunk/sound/pci/intel8x0.c | 2 +- trunk/sound/soc/atmel/atmel_ssc_dai.c | 2 +- trunk/sound/soc/atmel/atmel_ssc_dai.h | 2 +- trunk/sound/soc/codecs/wm8350.c | 2 +- trunk/sound/soc/codecs/wm8990.c | 3 +- trunk/sound/soc/omap/omap-pcm.c | 5 +- trunk/sound/usb/usbaudio.c | 1 - 262 files changed, 3696 insertions(+), 9043 deletions(-) delete mode 100644 trunk/drivers/rtc/rtc-dm355evm.c rename trunk/drivers/video/backlight/{da903x_bl.c => da903x.c} (100%) diff --git a/[refs] b/[refs] index 8bfe8947d000..e1c9d7c8ca2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 226b79104f625f3f58a8388b8b32a4b90415bf02 +refs/heads/master: e2a02ba6676cdc5ebec503b558838c08c7083c14 diff --git a/trunk/.mailmap b/trunk/.mailmap index a62e6a84fd1e..4e83e7b52d15 100644 --- a/trunk/.mailmap +++ b/trunk/.mailmap @@ -92,7 +92,6 @@ Rudolf Marek Rui Saraiva Sachin P Sant Sam Ravnborg -Sascha Hauer S.Çağlar Onur Simon Kelley Stéphane Witzmann @@ -101,7 +100,6 @@ Tejun Heo Thomas Graf Tony Luck Tsuneo Yoshioka -Uwe Kleine-König -Uwe Kleine-König Uwe Kleine-König +Uwe Kleine-König Valdis Kletnieks diff --git a/trunk/Documentation/cpu-freq/user-guide.txt b/trunk/Documentation/cpu-freq/user-guide.txt index 917918f84fc7..e3443ddcfb89 100644 --- a/trunk/Documentation/cpu-freq/user-guide.txt +++ b/trunk/Documentation/cpu-freq/user-guide.txt @@ -195,3 +195,19 @@ scaling_setspeed. By "echoing" a new frequency into this you can change the speed of the CPU, but only within the limits of scaling_min_freq and scaling_max_freq. + + +3.2 Deprecated Interfaces +------------------------- + +Depending on your kernel configuration, you might find the following +cpufreq-related files: +/proc/cpufreq +/proc/sys/cpu/*/speed +/proc/sys/cpu/*/speed-min +/proc/sys/cpu/*/speed-max + +These are files for deprecated interfaces to cpufreq, which offer far +less functionality. Because of this, these interfaces aren't described +here. + diff --git a/trunk/Documentation/filesystems/sysfs-pci.txt b/trunk/Documentation/filesystems/sysfs-pci.txt index 9f8740ca3f3b..68ef48839c04 100644 --- a/trunk/Documentation/filesystems/sysfs-pci.txt +++ b/trunk/Documentation/filesystems/sysfs-pci.txt @@ -9,7 +9,6 @@ that support it. For example, a given bus might look like this: | |-- class | |-- config | |-- device - | |-- enable | |-- irq | |-- local_cpus | |-- resource @@ -33,7 +32,6 @@ files, each with their own function. class PCI class (ascii, ro) config PCI config space (binary, rw) device PCI device (ascii, ro) - enable Whether the device is enabled (ascii, rw) irq IRQ number (ascii, ro) local_cpus nearby CPU mask (cpumask, ro) resource PCI resource host addresses (ascii, ro) @@ -59,19 +57,10 @@ used to do actual device programming from userspace. Note that some platforms don't support mmapping of certain resources, so be sure to check the return value from any attempted mmap. -The 'enable' file provides a counter that indicates how many times the device -has been enabled. If the 'enable' file currently returns '4', and a '1' is -echoed into it, it will then return '5'. Echoing a '0' into it will decrease -the count. Even when it returns to 0, though, some of the initialisation -may not be reversed. - The 'rom' file is special in that it provides read-only access to the device's ROM file, if available. It's disabled by default, however, so applications should write the string "1" to the file to enable it before attempting a read -call, and disable it following the access by writing "0" to the file. Note -that the device must be enabled for a rom read to return data succesfully. -In the event a driver is not bound to the device, it can be enabled using the -'enable' file, documented above. +call, and disable it following the access by writing "0" to the file. Accessing legacy resources through sysfs ---------------------------------------- diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 0ea3a6d98714..5bff376d297c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1021,14 +1021,6 @@ M: mb@bu3sch.de W: http://bu3sch.de/btgpio.php S: Maintained -BTRFS FILE SYSTEM -P: Chris Mason -M: chris.mason@oracle.com -L: linux-btrfs@vger.kernel.org -W: http://btrfs.wiki.kernel.org/ -T: git kernel.org:/pub/scm/linux/kernel/git/mason/btrfs-unstable.git -S: Maintained - BTTV VIDEO4LINUX DRIVER P: Mauro Carvalho Chehab M: mchehab@infradead.org @@ -2220,7 +2212,7 @@ P: Sean Hefty M: sean.hefty@intel.com P: Hal Rosenstock M: hal.rosenstock@gmail.com -L: general@lists.openfabrics.org (moderated for non-subscribers) +L: general@lists.openfabrics.org W: http://www.openib.org/ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git S: Supported @@ -4849,7 +4841,6 @@ P: Ingo Molnar M: mingo@redhat.com P: H. Peter Anvin M: hpa@zytor.com -M: x86@kernel.org L: linux-kernel@vger.kernel.org T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git S: Maintained diff --git a/trunk/Makefile b/trunk/Makefile index 681c1d23b4d4..7715b2c14fb4 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 29 -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc3 NAME = Erotic Pickled Herring # *DOCUMENTATION* diff --git a/trunk/arch/alpha/include/asm/bug.h b/trunk/arch/alpha/include/asm/bug.h index 1720c8ad86fe..7b85b7c93709 100644 --- a/trunk/arch/alpha/include/asm/bug.h +++ b/trunk/arch/alpha/include/asm/bug.h @@ -8,12 +8,12 @@ /* ??? Would be nice to use .gprel32 here, but we can't be sure that the function loaded the GP, so this could fail in modules. */ -#define BUG() do { \ +#define BUG() { \ __asm__ __volatile__( \ "call_pal %0 # bugchk\n\t" \ ".long %1\n\t.8byte %2" \ : : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__)); \ - for ( ; ; ); } while (0) + for ( ; ; ); } #define HAVE_ARCH_BUG #endif diff --git a/trunk/arch/frv/mm/dma-alloc.c b/trunk/arch/frv/mm/dma-alloc.c index 44840e73e907..dc6522c464d4 100644 --- a/trunk/arch/frv/mm/dma-alloc.c +++ b/trunk/arch/frv/mm/dma-alloc.c @@ -36,10 +36,10 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/trunk/arch/ia64/sn/kernel/io_acpi_init.c b/trunk/arch/ia64/sn/kernel/io_acpi_init.c index d0223abbbbd4..c5a214026a77 100644 --- a/trunk/arch/ia64/sn/kernel/io_acpi_init.c +++ b/trunk/arch/ia64/sn/kernel/io_acpi_init.c @@ -443,7 +443,7 @@ sn_acpi_slot_fixup(struct pci_dev *dev) size = pci_resource_len(dev, PCI_ROM_RESOURCE); addr = ioremap(pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE], size); - image_size = pci_get_rom_size(dev, addr, size); + image_size = pci_get_rom_size(addr, size); dev->resource[PCI_ROM_RESOURCE].start = (unsigned long) addr; dev->resource[PCI_ROM_RESOURCE].end = (unsigned long) addr + image_size - 1; diff --git a/trunk/arch/ia64/sn/kernel/io_init.c b/trunk/arch/ia64/sn/kernel/io_init.c index e2eb2da60f96..4e1801bad83a 100644 --- a/trunk/arch/ia64/sn/kernel/io_init.c +++ b/trunk/arch/ia64/sn/kernel/io_init.c @@ -269,7 +269,7 @@ sn_io_slot_fixup(struct pci_dev *dev) rom = ioremap(pci_resource_start(dev, PCI_ROM_RESOURCE), size + 1); - image_size = pci_get_rom_size(dev, rom, size + 1); + image_size = pci_get_rom_size(rom, size + 1); dev->resource[PCI_ROM_RESOURCE].end = dev->resource[PCI_ROM_RESOURCE].start + image_size - 1; diff --git a/trunk/arch/mips/include/asm/spinlock.h b/trunk/arch/mips/include/asm/spinlock.h index 0884947ebe27..1a1f320c30d8 100644 --- a/trunk/arch/mips/include/asm/spinlock.h +++ b/trunk/arch/mips/include/asm/spinlock.h @@ -51,7 +51,6 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock) return (((counters >> 14) - counters) & 0x1fff) > 1; } -#define __raw_spin_is_contended __raw_spin_is_contended static inline void __raw_spin_lock(raw_spinlock_t *lock) { diff --git a/trunk/arch/powerpc/sysdev/ipic.c b/trunk/arch/powerpc/sysdev/ipic.c index 88a983ece5c9..9a89cd3e80a2 100644 --- a/trunk/arch/powerpc/sysdev/ipic.c +++ b/trunk/arch/powerpc/sysdev/ipic.c @@ -890,7 +890,7 @@ unsigned int ipic_get_irq(void) return irq_linear_revmap(primary_ipic->irqhost, irq); } -#ifdef CONFIG_PM +#ifdef CONFIG_SUSPEND static struct { u32 sicfr; u32 siprr[2]; diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c index 7c35787d29b4..caf4c33f4e84 100644 --- a/trunk/arch/sh/boards/board-ap325rxa.c +++ b/trunk/arch/sh/boards/board-ap325rxa.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include