1. 25 3月, 2011 12 次提交
    • T
      percpu: Always align percpu output section to PAGE_SIZE · 0415b00d
      Tejun Heo 提交于
      Percpu allocator honors alignment request upto PAGE_SIZE and both the
      percpu addresses in the percpu address space and the translated kernel
      addresses should be aligned accordingly.  The calculation of the
      former depends on the alignment of percpu output section in the kernel
      image.
      
      The linker script macros PERCPU_VADDR() and PERCPU() are used to
      define this output section and the latter takes @align parameter.
      Several architectures are using @align smaller than PAGE_SIZE breaking
      percpu memory alignment.
      
      This patch removes @align parameter from PERCPU(), renames it to
      PERCPU_SECTION() and makes it always align to PAGE_SIZE.  While at it,
      add PCPU_SETUP_BUG_ON() checks such that alignment problems are
      reliably detected and remove percpu alignment comment recently added
      in workqueue.c as the condition would trigger BUG way before reaching
      there.
      
      For um, this patch raises the alignment of percpu area.  As the area
      is in .init, there shouldn't be any noticeable difference.
      
      This problem was discovered by David Howells while debugging boot
      failure on mn10300.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Acked-by: NMike Frysinger <vapier@gentoo.org>
      Cc: uclinux-dist-devel@blackfin.uclinux.org
      Cc: David Howells <dhowells@redhat.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: user-mode-linux-devel@lists.sourceforge.net
      0415b00d
    • L
      Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block · 6c510389
      Linus Torvalds 提交于
      * 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
        Documentation/iostats.txt: bit-size reference etc.
        cfq-iosched: removing unnecessary think time checking
        cfq-iosched: Don't clear queue stats when preempt.
        blk-throttle: Reset group slice when limits are changed
        blk-cgroup: Only give unaccounted_time under debug
        cfq-iosched: Don't set active queue in preempt
        block: fix non-atomic access to genhd inflight structures
        block: attempt to merge with existing requests on plug flush
        block: NULL dereference on error path in __blkdev_get()
        cfq-iosched: Don't update group weights when on service tree
        fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
        block: Require subsystems to explicitly allocate bio_set integrity mempool
        jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
        jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
        fs: make fsync_buffers_list() plug
        mm: make generic_writepages() use plugging
        blk-cgroup: Add unaccounted time to timeslice_used.
        block: fixup plugging stubs for !CONFIG_BLOCK
        block: remove obsolete comments for blkdev_issue_zeroout.
        blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
        ...
      
      Fix up conflicts in fs/{aio.c,super.c}
      6c510389
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 · 3dab04e6
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
        MN10300: gcc 4.6 vs am33 inline assembly
        MN10300: Deprecate gdbstub
        MN10300: Allow KGDB to use the MN10300 serial ports
        MN10300: Emulate single stepping in KGDB on MN10300
        MN10300: Generalise kernel debugger kernel halt, reboot or power off hook
        KGDB: Notify GDB of machine halt, reboot or power off
        MN10300: Use KGDB
        MN10300: Create generic kernel debugger hooks
        MN10300: Create general kernel debugger cache flushing
        MN10300: Introduce a general config option for kernel debugger hooks
        MN10300: The icache invalidate functions should disable the icache first
        MN10300: gdbstub: Restrict single-stepping to non-preemptable non-SMP configs
      3dab04e6
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 6d1e9a42
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        pstore: cleanups to pstore_dump()
        [IA64] New syscalls for 2.6.39
      6d1e9a42
    • L
      Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 95985725
      Linus Torvalds 提交于
      * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
        mmc: Add MMC_PROGRESS_*
        mmc, ARM: Rename SuperH Mobile ARM zboot helpers
        ARM: mach-shmobile: add coherent DMA mask to CEU camera devices
        ARM: mach-shmobile: Dynamic backlight control for Mackerel
      95985725
    • L
      Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 4d4fcae1
      Linus Torvalds 提交于
      * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
        sh: Fix build alloc_thread_info_node function
        sh: Fix ptrace hw_breakpoint handling
        sh: Fix ptrace fpu state initialisation
        sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED.
        sh: pmb: Use struct syscore_ops instead of sysdevs
        sh: Use struct syscore_ops instead of sysdevs
        sh: Conver to asm-generic/sizes.h.
        sh: wire up sys_syncfs.
      4d4fcae1
    • L
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · b4a41ed2
      Linus Torvalds 提交于
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        USB: cdc-acm: fix potential null-pointer dereference on disconnect
        USB: cdc-acm: fix potential null-pointer dereference
        USB: cdc-acm: fix memory corruption / panic
        USB: Fix 'bad dma' problem on WDM device disconnect
        usb: wwan: fix compilation without CONFIG_PM_RUNTIME
        USB: uss720 fixup refcount position
        usb: musb: blackfin: fix typo in new bfin_musb_vbus_status func
        usb: musb: blackfin: fix typo in new dev_pm_ops struct
        usb: musb: blackfin: fix typo in platform driver name
        usb: musb: Fix for merge issue
        ehci-hcd: Bug fix: don't set a QH's Halt bit
        USB: Do not pass negative length to snoop_urb()
      b4a41ed2
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 76d21c56
      Linus Torvalds 提交于
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
        [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
        [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
        [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
        [media] v4l: soc-camera: Store negotiated buffer settings
        [media] rc: interim support for 32-bit NEC-ish scancodes
        [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
        [media] lirc_zilog: error out if buffer read bytes != chunk size
        [media] lirc: silence some compile warnings
        [media] hdpvr: use same polling interval as other OS
        [media] ir-kbd-i2c: pass device code w/key in hauppauge case
        [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
        [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
        [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
        [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
        [media] rc-rc5-hauppauge-new: Add support for the old Black RC
        [media] rc-rc5-hauppauge-new: Add the old control to the table
        [media] rc-winfast: Fix the keycode tables
        [media] a800: Fix a few wrong IR key assignments
        [media] opera1: Use multimedia keys instead of an app-specific mapping
        [media] dw2102: Use multimedia keys instead of an app-specific mapping
        ...
      
      Fix up trivial conflicts (remove/modify and some real conflicts) in:
      	arch/arm/mach-omap2/devices.c
      	drivers/staging/Kconfig
      	drivers/staging/Makefile
      	drivers/staging/dabusb/dabusb.c
      	drivers/staging/dabusb/dabusb.h
      	drivers/staging/easycap/easycap_ioctl.c
      	drivers/staging/usbvideo/usbvideo.c
      	drivers/staging/usbvideo/vicam.c
      76d21c56
    • L
      Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra · 6e50e9f9
      Linus Torvalds 提交于
      * 'for-linus' of git://android.git.kernel.org/kernel/tegra:
        ARM: tegra: harmony: initialize the TPS65862 PMIC
        ARM: tegra: update defconfig
        ARM: tegra: harmony: update PCI-e initialization sequence
        ARM: tegra: trimslice: enable MMC/SD slots
        ARM: tegra: enable new drivers in defconfig
        ARM: tegra: Add Toshiba AC100 support
        ARM: tegra: harmony: Set WM8903 gpio_base
        ARM: tegra: harmony: I2C-related portions of audio support
        ARM: tegra: harmony: register i2c devices
        ARM: tegra: seaboard: register i2c devices
        ARM: tegra: harmony: Beginnings of audio support
        ARM: tegra: create defines for SD-related GPIO names
        ARM: tegra: add devices.c entries for audio
      6e50e9f9
    • L
      Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 · e264ac8c
      Linus Torvalds 提交于
      * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
        spi/pl022: Add loopback support for the SPI on 5500
        spi/omap_mcspi: Fix broken last word xfer
        of/flattree: minor cleanups
        dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table
        dt: protect against NULL matches passed to of_match_node()
        dt: Refactor of_platform_bus_probe()
      e264ac8c
    • S
      mmc: Add MMC_PROGRESS_* · 9d9659b6
      Simon Horman 提交于
      This is my second attempt to make this enum generally available.
      The first attempt added MMCIF_PROGRESS_* to include/linux/mmc/sh_mmcif.h.
      However this is not sufficiently generic as the enum will be
      used by SDHI boot code.
      Signed-off-by: NSimon Horman <horms@verge.net.au>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      9d9659b6
    • S
      mmc, ARM: Rename SuperH Mobile ARM zboot helpers · a6558c2d
      Simon Horman 提交于
      These headers and helpers will also be used for SDHI boot
      so the mmcif name will start to make a lot less sense.
      Signed-off-by: NSimon Horman <horms@verge.net.au>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      a6558c2d
  2. 24 3月, 2011 28 次提交