1. 25 5月, 2011 10 次提交
  2. 24 5月, 2011 30 次提交
    • L
      Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · d762f438
      Linus Torvalds 提交于
      * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
        sh: Ignore R_SH_NONE module relocations.
        SH: SE7751: Fix pcibios_map_platform_irq prototype.
        sh: remove warning and warning_symbol from struct stacktrace_ops
        sh: wire up sys_sendmmsg.
        clocksource: sh_tmu: Runtime PM support
        clocksource: sh_tmu: __clocksource_updatefreq_hz() update
        clocksource: sh_cmt: Runtime PM support
        clocksource: sh_cmt: __clocksource_updatefreq_hz() update
        dmaengine: shdma: synchronize RCU before freeing, simplify spinlock
        dmaengine: shdma: add runtime- and system-level power management
        dmaengine: shdma: fix locking
        sh: sh-sci: sh7377 and sh73a0 build fixes
        sh: cosmetic improvement: use an existing pointer
        serial: sh-sci: suspend/resume wakeup support V2
        serial: sh-sci: Runtime PM support
        sh: select IRQ_FORCED_THREADING.
        sh: intc: Set virtual IRQs as nothread.
        sh: fixup fpu.o compile order
        i2c: add a module alias to the sh-mobile driver
        ALSA: add a module alias to the FSI driver
        ...
      d762f438
    • L
      Merge branch 'perf-urgent-for-linus' of... · 52146383
      Linus Torvalds 提交于
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf tools: Fix sample type size calculation in 32 bits archs
        profile: Use vzalloc() rather than vmalloc() & memset()
      52146383
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · df462b3d
      Linus Torvalds 提交于
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits)
        [media] gspca - sunplus: Fix some warnings and simplify code
        [media] gspca: Fix some warnings tied to 'no debug'
        [media] gspca: Unset debug by default
        [media] gspca - cpia1: Remove a bad conditional compilation instruction
        [media] gspca - main: Remove USB traces
        [media] gspca - main: Version change to 2.13
        [media] gspca - stk014 / t613: Accept the index 0 in querymenu
        [media] gspca - kinect: Remove __devinitdata
        [media] gspca - cpia1: Fix some warnings
        [media] video/Kconfig: Fix mis-classified devices
        [media] support for medion dvb stick 1660:1921
        [media] tm6000: fix uninitialized field, change prink to dprintk
        [media] cx231xx: Add support for Iconbit U100
        [media] saa7134 add new TV cards
        [media] Use a more consistent value for RC repeat period
        [media] cx18: Move spinlock and vb_type initialisation into stream_init
        [media] tm6000: remove tm6010 sif audio start and stop
        [media] tm6000: remove unused exports
        [media] tm6000: add pts logging
        [media] tm6000: change from ioctl to unlocked_ioctl
        ...
      df462b3d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 · 343800e7
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
        fat: Fix statfs->f_namelen
        fat: Replace all printk with fat_msg()
        fat: Add fat_msg() function for preformated FAT messages
        fat: Convert fat_fs_error to use %pV
        fat: Fix possible null deref in fat_cache_add()
        fat: use new setup() for ->dir_ops too
      343800e7
    • G
      hwmon: (coretemp) Add comments describing the handling of HT CPUs · f4e0bcf0
      Guenter Roeck 提交于
      The coretemp driver provides a single set of device attributes for each
      physical core of a HT CPU to avoid duplicate sensors.  This
      functionality was introduced with commit d883b9f0 ("hwmon:
      (coretemp) Skip duplicate CPU entries").
      
      Commit e40cc4bd ("x86/hwmon: register alternate sibling upon CPU
      removal") extends this functionality to register the HT sibling of a CPU
      which is taken offline, to ensure that sensor attributes are provided if
      at least one HT sibling of a core is online.
      
      Add comments into the code describing the functionality in some more
      detail.
      Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: Durgadoss R <durgadoss.r@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f4e0bcf0
    • L
      kernel/watchdog.c: Use proper ANSI C prototypes · 5f2e8e2b
      Linus Torvalds 提交于
      We try to enforce it by using -Wstrict-prototypes, but apparently they
      sometimes get through.  Introduced by 4eec42f3 ("watchdog: Change
      the default timeout and configure nmi watchdog period based").
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5f2e8e2b
    • F
      perf tools: Fix sample type size calculation in 32 bits archs · 0f61f3e4
      Frederic Weisbecker 提交于
      The shift used here to count the number of bits set in
      the mask doesn't work above the low part for archs that
      are not 64 bits.
      
      Fix the constant used for the shift.
      
      This fixes a 32-bit perf top failure reported by Eric Dumazet:
      
      	Can't parse sample, err = -14
      	Can't parse sample, err = -14
      	...
      Reported-and-tested-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Eric Dumazet <eric.dumazet@gmail.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Stephane Eranian <eranian@google.com
      Link: http://lkml.kernel.org/r/1306200686-17317-1-git-send-email-fweisbec@gmail.comSigned-off-by: NIngo Molnar <mingo@elte.hu>
      0f61f3e4
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 5e152b4c
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)
        PCI: Don't use dmi_name_in_vendors in quirk
        PCI: remove unused AER functions
        PCI/sysfs: move bus cpuaffinity to class dev_attrs
        PCI: add rescan to /sys/.../pci_bus/.../
        PCI: update bridge resources to get more big ranges when allocating space (again)
        KVM: Use pci_store/load_saved_state() around VM device usage
        PCI: Add interfaces to store and load the device saved state
        PCI: Track the size of each saved capability data area
        PCI/e1000e: Add and use pci_disable_link_state_locked()
        x86/PCI: derive pcibios_last_bus from ACPI MCFG
        PCI: add latency tolerance reporting enable/disable support
        PCI: add OBFF enable/disable support
        PCI: add ID-based ordering enable/disable support
        PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.
        PCI: Set PCIE maxpayload for card during hotplug insertion
        PCI/ACPI: Report _OSC control mask returned on failure to get control
        x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs
        PCI: handle positive error codes
        PCI: check pci_vpd_pci22_wait() return
        PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio
        ...
      
      Fix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be
      moved the intel SMBUS ID definitons to the i2c-i801.c driver.
      5e152b4c
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · a77febbe
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: obey minleft values during extent allocation correctly
        xfs: reset buffer pointers before freeing them
        xfs: avoid getting stuck during async inode flushes
        xfs: fix xfs_itruncate_start tracing
        xfs: fix duplicate workqueue initialisation
        xfs: kill off xfs_printk()
        xfs: fix race condition in AIL push trigger
        xfs: make AIL target updates and compares 32bit safe.
        xfs: always push the AIL to the target
        xfs: exit AIL push work correctly when AIL is empty
        xfs: ensure reclaim cursor is reset correctly at end of AG
        xfs: add an x86 compat handler for XFS_IOC_ZERO_RANGE
        xfs: fix compiler warning in xfs_trace.h
        xfs: cleanup duplicate initializations
        xfs: reduce the number of pagb_lock roundtrips in xfs_alloc_clear_busy
        xfs: exact busy extent tracking
        xfs: do not immediately reuse busy extent ranges
        xfs: optimize AGFL refills
      a77febbe
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 42cd71bf
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (137 commits)
        ARM: bcmring: convert to use sp804 clockevents
        ARM: bcmring: convert to sp804 clocksource
        ARM: 6912/1: bcmring: Add clkdev table in init_early
        clockevents: ARM sp804: obtain sp804 timer rate via clks
        clockevents: ARM sp804: allow clockevent name to be specified
        clocksource: ARM sp804: obtain sp804 timer rate via clks
        clocksource: ARM sp804: allow clocksource name to be specified
        clocksource: convert OMAP1 to 32-bit down counting clocksource
        clocksource: convert MXS timrotv2 to 32-bit down counting clocksource
        clocksource: convert SPEAr platforms 16-bit up counting clocksource
        clocksource: convert Integrator/AP 16-bit down counting clocksource
        clocksource: convert W90x900 24-bit down counting clocksource
        clocksource: convert ARM 32-bit down counting clocksources
        clocksource: convert ARM 32-bit up counting clocksources
        clocksource: add common mmio clocksource
        ARM: update sa1100 to reflect PXA updates
        ARM: omap1: convert to using readl/writel instead of volatile struct
        ARM: omap1: delete useless interrupt handler
        ARM: s5p: consolidate selection of timer register
        ARM: 6939/1: fix missing 'cpu_relax()' declaration
        ...
      42cd71bf
    • V
      Documentation: update GregKH links · f5039935
      Vikram Narayanan 提交于
      Fixed the broken links in the SubmittingPatches file.
      
      [ The old links turn out to not be broken after all, but the new links
        are certainly more readable - Linus ]
      Signed-off-by: NVikram Narayanan <vikram186@gmail.com>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f5039935
    • N
      Documentation: fix vgaarbiter.txt typos etc. · f14d8d3a
      Nicolas Kaiser 提交于
      Fixed typos.
      
      v2: Incorporated changes by Randy Dunlap.
      Signed-off-by: NNicolas Kaiser <nikai@nikai.net>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f14d8d3a
    • H
      Documentation: update LXR web link · 82082660
      Harry Wei 提交于
      Update LXR (Linux cross reference) web link.
      Signed-off-by: NHarry Wei <harryxiyou@gmail.com>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      82082660
    • L
      Documentation: update epoll sysctl text · 52307a9e
      Lucian Adrian Grijincu 提交于
      max_user_instances was removed in this commit:
      
         commit 9df04e1f
         Author: Davide Libenzi <davidel@xmailserver.org>
         Date:   Thu Jan 29 14:25:26 2009 -0800
      
          epoll: drop max_user_instances and rely only on max_user_watches
      
      but the documentation entry was not removed.
      
      Cc: Davide Libenzi <davidel@xmailserver.org>
      Signed-off-by: NLucian Adrian Grijincu <lucian.grijincu@gmail.com>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      52307a9e
    • R
      Documentation: update dontdiff file · 56dab6c2
      Randy Dunlap 提交于
      v2, updated based on comments from Joe and Paul.
      
      Update to Documentation/dontdiff, based on many updates to
      various .gitignore patches over the last 2 years.
      
      Initially begun by Michael Prokop <mika@grml.org>, with lots of
      changes by Randy Dunlap.
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Michael Prokop <mika@grml.org>
      Cc: Joe Perches <joe@perches.com>
      Cc: Paul Mundt <lethal@linux-sh.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      56dab6c2
    • L
      Merge branch 'x86-apic-for-linus' of... · ea2b50ef
      Linus Torvalds 提交于
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, apic: Include module.h header in apic_flat_64.c
        x86, apic: Make apic drivers static
        x86, apic: Clean up bigsmp apic selection code
        x86, apic: Use .apicdrivers section for the apic drivers list
        x86, apic: Introduce .apicdrivers section to find the list of apic drivers
        x86, x2apic: Move the common bits to x2apic.h
        x86, x2apic: Minimize IPI register writes using cluster groups
        x86, x2apic: Track the x2apic cluster sibling map
        x86, x2apic: Remove duplicate code for IPI mask routines
        x86, apic: Use probe routines to simplify apic selection
        x86, ioapic: Consolidate mp_ioapic_routing[] into 'struct ioapic'
        x86, ioapic: Consolidate gsi routing info into 'struct ioapic'
        x86, ioapic: Consolidate mp_ioapics[] into 'struct ioapic'
        x86, ioapic: Consolidate ioapic_saved_data[] into 'struct ioapic'
        x86, ioapic: Add struct ioapic
        x86, ioapic: Remove duplicate code for saving/restoring RTEs
        x86, ioapic: Use ioapic_saved_data while enabling intr-remapping
        x86, ioapic: Allocate ioapic_saved_data early
        x86, ioapic: Fix potential resume deadlock
      ea2b50ef
    • L
      Merge branch 'sched-core-for-linus' of... · 15a3d11b
      Linus Torvalds 提交于
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: Increase SCHED_LOAD_SCALE resolution
        sched: Introduce SCHED_POWER_SCALE to scale cpu_power calculations
        sched: Cleanup set_load_weight()
      15a3d11b
    • L
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 1f3a8e09
      Linus Torvalds 提交于
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
        staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
        staging:iio: Trivial kconfig reorganization and uniformity improvements.
        staging:iio:documenation partial update.
        staging:iio: use pollfunc allocation helpers in remaining drivers.
        staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
        staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
        staging:iio:meter:ade7758: Use private data space from iio_allocate_device
        staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
        staging:iio: ring core cleanups + check if read_last available in lis3l02dq
        staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
        staging:iio: poll func allocation clean up.
        staging:iio:ad7780 trivial unused header cleanup.
        staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
        staging:iio:adc:AD7780: Convert to new channel registration method
        staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
        staging:iio:adc: AD7606: Consitently use indio_dev
        staging:iio: Rip out helper for software rings.
        staging:iio:adc:AD7298: Use private data space from iio_allocate_device
        staging:iio: rationalization of different buffer implementation hooks.
        staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
        ...
      
      Fix up trivial conflicts in
       - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
       - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
       - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
      1f3a8e09
    • L
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · c44dead7
      Linus Torvalds 提交于
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits)
        USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h
        USB: UHCI: Support big endian GRUSBHC HC
        sparc: add {read,write}*_be routines
        USB: UHCI: Add support for big endian descriptors
        USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier
        USB: UHCI: Add support for big endian mmio
        usb-storage: Correct adjust_quirks to include latest flags
        usb/isp1760: Fix possible unlink problems
        usb/isp1760: Move function isp1760_endpoint_disable() within file.
        USB: remove remaining usages of hcd->state from usbcore and fix regression
        usb: musb: ux500: add configuration and build options for ux500 dma
        usb: musb: ux500: add dma glue layer for ux500
        usb: musb: ux500: add dma name for ux500
        usb: musb: ux500: add ux500 specific code for gadget side
        usb: musb: fix compile error
        usb-storage: fix up the unusual_realtek device list
        USB: gadget: f_audio: Fix invalid dereference of initdata
        EHCI: don't rescan interrupt QHs needlessly
        OHCI: fix regression caused by nVidia shutdown workaround
        USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage
        ...
      c44dead7
    • R
      x86, apic: Include module.h header in apic_flat_64.c · b18bf094
      Randy Dunlap 提交于
      apic_flat_64.c needs to include module.h because it uses
      EXPORT_SYMBOL_GPL().
      
      This fixes these warnings on some !SMP randconfigs:
      
        arch/x86/kernel/apic/apic_flat_64.c:31: warning: data definition has no type or storage class
        arch/x86/kernel/apic/apic_flat_64.c:31: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
        arch/x86/kernel/apic/apic_flat_64.c:31: warning: parameter names (without types) in function declaration
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Link: http://lkml.kernel.org/r/20110523104300.dd532a99.randy.dunlap@oracle.comSigned-off-by: NIngo Molnar <mingo@elte.hu>
      b18bf094
    • L
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 99dff585
      Linus Torvalds 提交于
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
        serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
        tty/serial: Fix break handling for PORT_TEGRA
        tty/serial: Add explicit PORT_TEGRA type
        n_tracerouter and n_tracesink ldisc additions.
        Intel PTI implementaiton of MIPI 1149.7.
        Kernel documentation for the PTI feature.
        export kernel call get_task_comm().
        tty: Remove to support serial for S5P6442
        pch_phub: Support new device ML7223
        8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
        ASoC: Update cx20442 for TTY API change
        pch_uart: Support new device ML7223 IOH
        parport: Use request_muxed_region for IT87 probe and lock
        tty/serial: add support for Xilinx PS UART
        n_gsm: Use print_hex_dump_bytes
        drivers/tty/moxa.c: Put correct tty value
        TTY: tty_io, annotate locking functions
        TTY: serial_core, remove superfluous set_task_state
        TTY: serial_core, remove invalid test
        Char: moxa, fix locking in moxa_write
        ...
      
      Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
      drivers/tty/serial/Makefile.
      
      I did the hci_ldisc thing as an evil merge, cleaning things up.
      99dff585
    • G
      hwmon: (coretemp) Fix compile error if CONFIG_SMP is not defined · bb74e8ca
      Guenter Roeck 提交于
      cpu_sibling_mask() is not defined unless CONFIG_SMP is defined, so it
      must not be used directly in the code without ifdef protection.
      
      To solve the problem and avoid ifdefs in the code, define
      for_each_sibling() and use it instead.
      Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: Durgadoss R <durgadoss.r@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bb74e8ca
    • L
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 30cb6d5f
      Linus Torvalds 提交于
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        hrtimers: Reorder clock bases
        hrtimers: Avoid touching inactive timer bases
        hrtimers: Make struct hrtimer_cpu_base layout less stupid
        timerfd: Manage cancelable timers in timerfd
        clockevents: Move C3 stop test outside lock
        alarmtimer: Drop device refcount after rtc_open()
        alarmtimer: Check return value of class_find_device()
        timerfd: Allow timers to be cancelled when clock was set
        hrtimers: Prepare for cancel on clock was set timers
      30cb6d5f
    • R
      Merge branch 'devel-stable' into for-linus · 9a55d975
      Russell King 提交于
      Conflicts:
      	arch/arm/Kconfig
      	arch/arm/mach-ns9xxx/include/mach/uncompress.h
      9a55d975
    • R
      Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and... · ec19628d
      Russell King 提交于
      Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus
      ec19628d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 4867faab
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: Deal with hyperthetical case of PAGE_SIZE > 2M
        slub: Remove node check in slab_free
        slub: avoid label inside conditional
        slub: Make CONFIG_DEBUG_PAGE_ALLOC work with new fastpath
        slub: Avoid warning for !CONFIG_SLUB_DEBUG
        slub: Remove CONFIG_CMPXCHG_LOCAL ifdeffery
        slub: Move debug handlign in __slab_free
        slub: Move node determination out of hotpath
        slub: Eliminate repeated use of c->page through a new page variable
        slub: get_map() function to establish map of free objects in a slab
        slub: Use NUMA_NO_NODE in get_partial
        slub: Fix a typo in config name
      4867faab
    • R
      Merge branches 'consolidate-clksrc', 'consolidate-flash',... · 4b60e5f9
      Russell King 提交于
      Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
      4b60e5f9
    • R
      ARM: bcmring: convert to use sp804 clockevents · e8765afe
      Russell King 提交于
      bcmring has a set of four sp804 timers incorporated, yet it has its
      own copy of the sp804 code.  Convert its clockevent implementation
      to the standard sp804 support code.
      
      Cc: Jiandong Zheng <jdzheng@broadcom.com>
      Cc: Scott Branden <sbranden@broadcom.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      e8765afe
    • R
      ARM: bcmring: convert to sp804 clocksource · 82d63734
      Russell King 提交于
      bcmring has a set of four sp804 timers incorporated, yet it has its
      own copy of the sp804 code.  Convert its clocksource implementation
      to the standard sp804 support code.
      
      Cc: Jiandong Zheng <jdzheng@broadcom.com>
      Cc: Scott Branden <sbranden@broadcom.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      82d63734
    • J
      ARM: 6912/1: bcmring: Add clkdev table in init_early · ede2e234
      Jiandong Zheng 提交于
      Move adding clkdev table to init_early to make sure the common sp804 clockevents can be initialized properly.
      Signed-off-by: NJiandong Zheng <jdzheng@broadcom.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      ede2e234