1. 24 Mar, 2011 40 commits
    • Tejun Heo's avatar
      percpu: Always align percpu output section to PAGE_SIZE · 0415b00d
      Tejun Heo authored
      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: default avatarTejun Heo <tj@kernel.org>
      Acked-by: default avatarMike 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
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block · 6c510389
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 · 3dab04e6
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 6d1e9a42
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 95985725
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 4d4fcae1
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · b4a41ed2
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 76d21c56
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra · 6e50e9f9
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 · e264ac8c
      Linus Torvalds authored
      * '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
    • Simon Horman's avatar
      mmc: Add MMC_PROGRESS_* · 9d9659b6
      Simon Horman authored
      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: default avatarSimon Horman <horms@verge.net.au>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      9d9659b6
    • Simon Horman's avatar
      mmc, ARM: Rename SuperH Mobile ARM zboot helpers · a6558c2d
      Simon Horman authored
      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: default avatarSimon Horman <horms@verge.net.au>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      a6558c2d
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 047f61c5
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (42 commits)
        ACPI: minor printk format change in acpi_pad
        ACPI: make acpi_pad /sys output more readable
        ACPICA: Update version to 20110316
        ACPICA: Header support for SLIC table
        ACPI: Make sure the FADT is at least rev 2 before using the reset register
        ACPI: Bug compatibility for Windows on the ACPI reboot vector
        ACPICA: Fix access width for reset vector
        ACPI battery: fribble sysfs files from a resume notifier
        ACPI button: remove unused procfs I/F
        ACPI, APEI, Add PCIe AER error information printing support
        PCIe, AER, use pre-generated prefix in error information printing
        ACPI, APEI, Add ERST record ID cache
        ACPI: Use syscore_ops instead of sysdev class and sysdev
        ACPI: Remove the unused EC sysdev class
        ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree
        ACPI: use __init where possible in processor driver
        Thermal_Framework-Fix_crash_during_hwmon_unregister
        ACPICA: Update version to 20110211.
        ACPICA: Add mechanism to defer _REG methods for some installed handlers
        ACPICA: Add support for FunctionalFixedHW in acpi_ut_get_region_name
        ...
      047f61c5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 05061bf6
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
        Blackfin: bf54x: re-enable anomaly 05000353 for all revs
        Blackfin: enable atomic64_t support
        Blackfin: wire up new syncfs syscall
        Blackfin: SMP: flush CoreB cache when shutting down
      05061bf6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 · fdc0ad80
      Linus Torvalds authored
      * 'for-linus' of git://git.infradead.org/ubi-2.6:
        UBIFS: fix assertion warning and refine comments
        UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS
        UBIFS: use GFP_NOFS properly
        UBI: use GFP_NOFS properly
      fdc0ad80
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux · dc87c551
      Linus Torvalds authored
      * 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
        SUNRPC: Remove resource leak in svc_rdma_send_error()
        nfsd: wrong index used in inner loop
        nfsd4: fix comment and remove unused nfsd4_file fields
        nfs41: make sure nfs server return right ca_maxresponsesize_cached
        nfsd: fix compile error
        svcrpc: fix bad argument in unix_domain_find
        nfsd4: fix struct file leak
        nfsd4: minor nfs4state.c reshuffling
        svcrpc: fix rare race on unix_domain creation
        nfsd41: modify the members value of nfsd4_op_flags
        nfsd: add proc file listing kernel's gss_krb5 enctypes
        gss:krb5 only include enctype numbers in gm_upcall_enctypes
        NFSD, VFS: Remove dead code in nfsd_rename()
        nfsd: kill unused macro definition
        locks: use assign_type()
      dc87c551
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus · 5818fcc8
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
        Squashfs: Use vmalloc rather than kmalloc for zlib workspace
        Squashfs: handle corruption of directory structure
        Squashfs: wrap squashfs_mount() definition
        Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore
        Squashfs: Update documentation to include compression options
        Squashfs: Update Kconfig help text to include xz compression
        Squashfs: add compression options support to xz decompressor
        Squashfs: extend decompressor framework to handle compression options
      5818fcc8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 0625bef6
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB: Increase DMA max_segment_size on Mellanox hardware
        IB/mad: Improve an error message so error code is included
        RDMA/nes: Don't print success message at level KERN_ERR
        RDMA/addr: Fix return of uninitialized ret value
        IB/srp: try to use larger FMR sizes to cover our mappings
        IB/srp: add support for indirect tables that don't fit in SRP_CMD
        IB/srp: rework mapping engine to use multiple FMR entries
        IB/srp: allow sg_tablesize to be set for each target
        IB/srp: move IB CM setup completion into its own function
        IB/srp: always avoid non-zero offsets into an FMR
      0625bef6
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · a6a1d648
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (90 commits)
        mfd: Push byte swaps out of wm8994 bulk read path
        mfd: Rename ab8500 gpadc header
        mfd: Constify WM8994 write path
        mfd: Push byte swap out of WM8994 bulk I/O
        mfd: Avoid copying data in WM8994 I2C write
        mfd: Remove copy from WM831x I2C write function
        mfd: Staticise WM8994 PM ops
        regulator: Add a subdriver for TI TPS6105x regulator portions v2
        mfd: Add a core driver for TI TPS61050/TPS61052 chips v2
        gpio: Add Tunnel Creek support to sch_gpio
        mfd: Add Tunnel Creek support to lpc_sch
        pci_ids: Add Intel Tunnel Creek LPC Bridge device ID.
        regulator: MAX8997/8966 support
        mfd: Add WM8994 bulk register write operation
        mfd: Append additional read write on 88pm860x
        mfd: Adopt mfd_data in 88pm860x input driver
        mfd: Adopt mfd_data in 88pm860x regulator
        mfd: Adopt mfd_data in 88pm860x led
        mfd: Adopt mfd_data in 88pm860x backlight
        mfd: Fix MAX8997 Kconfig entry typos
        ...
      a6a1d648
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 1b506cfb
      Linus Torvalds authored
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        exofs: deprecate the commands pending counter
        exofs: Write sbi->s_nextid as part of the Create command
        exofs: Add option to mount by osdname
        exofs: Override read-ahead to align on stripe_size
        exofs: simple fsync race fix
        exofs: Optimize read_4_write
        exofs: Trivial: fix some indentation and debug prints
        exofs: Remove redundant unlikely()
      1b506cfb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 · 4cc4d24e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (140 commits)
        MAINTAINERS: de-orphan fbdev.
        MAINTAINERS: Add file pattern for fb dt bindings.
        video: Move sm501fb devicetree binding documentation to a better place.
        fbcon: fix situation where fbcon gets deinitialised and can't reinit.
        video, sm501: add OF binding to support SM501
        video, sm501: add edid and commandline support
        video, sm501: add I/O functions for use on powerpc
        video: Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET
        fbcon: Bugfix soft cursor detection in Tile Blitting
        video: add missing framebuffer_release in error path
        video: metronomefb: add __devexit_p around reference to metronomefb_remove
        video: hecubafb: add __devexit_p around reference to hecubafb_remove
        drivers:video:aty:radeon_base Fix typo occationally to occasionally
        atmel_lcdfb: add fb_blank function
        atmel_lcdfb: implement inverted contrast pwm
        video: s3c-fb: return proper error if clk_get fails
        uvesafb,vesafb: create WC or WB PAT-entries
        video: ffb: fix ffb_probe error path
        radeonfb: Let hwmon driver probe the "monid" I2C bus
        fbdev: sh_mobile_lcdc: checking NULL instead of IS_ERR()
        ...
      4cc4d24e
    • Artem Bityutskiy's avatar
      UBIFS: fix assertion warning and refine comments · 6ed09c34
      Artem Bityutskiy authored
      This patch fixes the following UBIFS assertion warning:
      
      UBIFS assert failed in do_readpage at 115 (pid 199)
      [<b00321b8>] (unwind_backtrace+0x0/0xdc) from [<af025118>]
      (do_readpage+0x108/0x594 [ubifs])
      [<af025118>] (do_readpage+0x108/0x594 [ubifs]) from [<af025764>]
      (ubifs_write_end+0x1c0/0x2e8 [ubifs])
      [<af025764>] (ubifs_write_end+0x1c0/0x2e8 [ubifs]) from
      [<b00a0164>] (generic_file_buffered_write+0x18c/0x270)
      [<b00a0164>] (generic_file_buffered_write+0x18c/0x270) from
      [<b00a08d4>] (__generic_file_aio_write+0x478/0x4c0)
      [<b00a08d4>] (__generic_file_aio_write+0x478/0x4c0) from
      [<b00a0984>] (generic_file_aio_write+0x68/0xc8)
      [<b00a0984>] (generic_file_aio_write+0x68/0xc8) from
      [<af024a78>] (ubifs_aio_write+0x178/0x1d8 [ubifs])
      [<af024a78>] (ubifs_aio_write+0x178/0x1d8 [ubifs]) from
      [<b00d104c>] (do_sync_write+0xb0/0x100)
      [<b00d104c>] (do_sync_write+0xb0/0x100) from [<b00d1abc>]
      (vfs_write+0xac/0x154)
      [<b00d1abc>] (vfs_write+0xac/0x154) from [<b00d1c10>]
      (sys_write+0x3c/0x68)
      [<b00d1c10>] (sys_write+0x3c/0x68) from [<b002d9a0>]
      (ret_fast_syscall+0x0/0x2c)
      
      The 'PG_checked' flag is used to indicate that the page does not
      supposedly exist on the media (e.g., a hole or a page beyond the
      inode size), so it requires slightly bigger budget, because we have
      to account the indexing size increase. And this flag basically
      tells that the budget for this page has to be "new page budget".
      The "new page budget" is slightly bigger than the "existing page
      budget".
      
      The 'do_readpage()' function has the following assertion which
      sometimes is hit: 'ubifs_assert(!PageChecked(page))'. Obviously,
      the meaning of this assertion is: "I should not be asked to read
      a page which does not exist on the media".
      
      However, in 'ubifs_write_begin()' we have a small "trick". Notice,
      that VFS may write pages which were not read yet, so the page data
      were not loaded from the media to the page cache yet. If VFS tells
      that it is going to change only some part of the page, we obviously
      have to load it from the media. However, if VFS tells that it is
      going to change whole page, we do not read it from the media for
      optimization purposes.
      
      However, since we do not read it, we do not know if it exists on
      the media or not (a hole, etc). So we set the 'PG_checked' flag
      to this page to force bigger budget, just in case.
      
      So 'ubifs_write_begin()' sets 'PG_checked'. Then we are in
      'ubifs_write_end()'. And VFS tells us: "hey, for some reasons I
      changed my mind and did not change whole page". Frankly, I do not
      know why this happens, but I hit this somehow on an ARM platform.
      And this is extremely rare.
      
      So in this case UBIFS does the following:
      
      1. Cancels allocated budget.
      2. Loads the page from the media by calling 'do_readpage()'.
      3. Asks VFS to repeat the whole write operation from the very
         beginning (call '->write_begin() again, etc).
      
      And the assertion warning is hit at the step 2 - remember we have
      the 'PG_checked' set for this page, and 'do_readpage()' does not
      like this. So this patch fixes the problem by adding step 1.5 and
      cleaning the 'PG_checked' before calling 'do_readpage()'.
      
      All in all, this patch does not fix any functionality issue, but it
      silences UBIFS false positive warning which may happen in very very
      rare cases.
      
      And while on it, this patch also improves a commentary which explains
      the reasons of setting the 'PG_checked' flag for the page. The old
      commentary was a bit difficult to understand.
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      6ed09c34
    • Artem Bityutskiy's avatar
      UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS · 9d523caf
      Artem Bityutskiy authored
      Simplify UBIFS configuration menu and kill the option to enable self-check
      compile-time. We do not really need this because we can do this run-time
      using the module parameters or the corresponding sysfs interfaces. And
      there is a value in simplifying the kernel configuration menu which becomes
      increasingly large.
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      9d523caf
    • Artem Bityutskiy's avatar
      UBIFS: use GFP_NOFS properly · fc5e58c0
      Artem Bityutskiy authored
      This patch fixes a brown-paperbag bug which was introduced by me:
      I used incorrect "GFP_KERNEL | GFP_NOFS" allocation flags to make
      sure my allocations do not cause write-back. But the correct form
      is "GFP_NOFS".
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      fc5e58c0
    • Artem Bityutskiy's avatar
      UBI: use GFP_NOFS properly · 3d46b316
      Artem Bityutskiy authored
      This patch fixes a brown-paperbag bug which was introduced by me:
      I used incorrect "GFP_KERNEL | GFP_NOFS" allocation flags to make
      sure my allocations do not cause write-back. But the correct form
      is "GFP_NOFS".
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      3d46b316
    • Nobuhiro Iwamatsu's avatar
      sh: Fix build alloc_thread_info_node function · b15ed691
      Nobuhiro Iwamatsu authored
      By commit b6a84016,
      alloc_thread_info was replaced by alloc_thread_info_node.
      However, the change of the function name and the addition of the argument
      were incomplete.
      Signed-off-by: default avatarNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
      CC: Eric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      b15ed691
    • Paul Mundt's avatar
      Merge branch 'master' of... · a3d33622
      Paul Mundt authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
      a3d33622
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · b81a618d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        deal with races in /proc/*/{syscall,stack,personality}
        proc: enable writing to /proc/pid/mem
        proc: make check_mem_permission() return an mm_struct on success
        proc: hold cred_guard_mutex in check_mem_permission()
        proc: disable mem_write after exec
        mm: implement access_remote_vm
        mm: factor out main logic of access_process_vm
        mm: use mm_struct to resolve gate vma's in __get_user_pages
        mm: arch: rename in_gate_area_no_task to in_gate_area_no_mm
        mm: arch: make in_gate_area take an mm_struct instead of a task_struct
        mm: arch: make get_gate_vma take an mm_struct instead of a task_struct
        x86: mark associated mm when running a task in 32 bit compatibility mode
        x86: add context tag to mark mm when running a task in 32-bit compatibility mode
        auxv: require the target to be tracable (or yourself)
        close race in /proc/*/environ
        report errors in /proc/*/*map* sanely
        pagemap: close races with suid execve
        make sessionid permissions in /proc/*/task/* match those in /proc/*
        fix leaks in path_lookupat()
      
      Fix up trivial conflicts in fs/proc/base.c
      b81a618d
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 2f284c84
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (35 commits)
        ARM: Update (and cut down) mach-types
        ARM: 6771/1: vexpress: add support for multiple core tiles
        ARM: 6797/1: hw_breakpoint: Fix newlines in WARNings
        ARM: 6751/1: vexpress: select applicable errata workarounds in Kconfig
        ARM: 6753/1: omap4: Enable ARM local timers with OMAP4430 es1.0 exception
        ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime
        ARM: pgtable: add pud-level code
        ARM: 6673/1: LPAE: use phys_addr_t instead of unsigned long for start of membanks
        ARM: Use long long format when printing meminfo physical addresses
        ARM: integrator: add Integrator/CP sched_clock support
        ARM: realview/vexpress: consolidate SMP bringup code
        ARM: realview/vexpress: consolidate localtimer support
        ARM: integrator/versatile: consolidate FPGA IRQ handling code
        ARM: rationalize versatile family Kconfig/Makefile
        ARM: realview: remove old AMBA device DMA definitions
        ARM: versatile: remove old AMBA device DMA definitions
        ARM: vexpress: use new init_early for clock tree and sched_clock init
        ARM: realview: use new init_early for clock tree and sched_clock init
        ARM: versatile: use new init_early for clock tree and sched_clock init
        ARM: integrator: use new init_early for clock tree init
        ...
      2f284c84
    • Philippe Langlais's avatar
      spi/pl022: Add loopback support for the SPI on 5500 · 06fb01fd
      Philippe Langlais authored
      Extend the vendor data with a loopback field, and add new
      amba-pl022 vendor data for the DB5500 pl023, as the pl023
      on db8500 and db5500 vary.
      Signed-off-by: default avatarPrajadevi H <prajadevi.h@stericsson.com>
      Signed-off-by: default avatarPhilippe Langlais <philippe.langlais@linaro.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      06fb01fd
    • Olaf Hering's avatar
      crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr,... · 93a72052
      Olaf Hering authored
      crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn
      
      The Xen PV drivers in a crashed HVM guest can not connect to the dom0
      backend drivers because both frontend and backend drivers are still in
      connected state.  To run the connection reset function only in case of a
      crashdump, the is_kdump_kernel() function needs to be available for the PV
      driver modules.
      
      Consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn into
      kernel/crash_dump.c Also export elfcorehdr_addr to make is_kdump_kernel()
      usable for modules.
      
      Leave 'elfcorehdr' as early_param().  This changes powerpc from __setup()
      to early_param().  It adds an address range check from x86 also on ia64
      and powerpc.
      
      [akpm@linux-foundation.org: additional #includes]
      [akpm@linux-foundation.org: remove elfcorehdr_addr export]
      [akpm@linux-foundation.org: fix for Tejun's mm/nobootmem.c changes]
      Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Cc: "Luck, Tony" <tony.luck@intel.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mundt <lethal@linux-sh.org>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      93a72052
    • FUJITA Tomonori's avatar
      remove dma64_addr_t · 85477277
      FUJITA Tomonori authored
      There is no user now.
      Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Cc: David Miller <davem@davemloft.net>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: Matt Turner <mattst88@gmail.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      85477277
    • Mandeep Singh Baines's avatar
      taskstats: use appropriate printk priority level · f9b182e2
      Mandeep Singh Baines authored
      printk()s without a priority level default to KERN_WARNING.  To reduce
      noise at KERN_WARNING, this patch set the priority level appriopriately
      for unleveled printks()s.  This should be useful to folks that look at
      dmesg warnings closely.
      Signed-off-by: default avatarMandeep Singh Baines <msb@chromium.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f9b182e2
    • Serge E. Hallyn's avatar
      userns: rename is_owner_or_cap to inode_owner_or_capable · 2e149670
      Serge E. Hallyn authored
      And give it a kernel-doc comment.
      
      [akpm@linux-foundation.org: btrfs changed in linux-next]
      Signed-off-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
      Cc: "Eric W. Biederman" <ebiederm@xmission.com>
      Cc: Daniel Lezcano <daniel.lezcano@free.fr>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Cc: James Morris <jmorris@namei.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2e149670
    • Serge E. Hallyn's avatar
      userns: userns: check user namespace for task->file uid equivalence checks · e795b717
      Serge E. Hallyn authored
      Cheat for now and say all files belong to init_user_ns.  Next step will be
      to let superblocks belong to a user_ns, and derive inode_userns(inode)
      from inode->i_sb->s_user_ns.  Finally we'll introduce more flexible
      arrangements.
      
      Changelog:
      	Feb 15: make is_owner_or_cap take const struct inode
      	Feb 23: make is_owner_or_cap bool
      
      [akpm@linux-foundation.org: coding-style fixes]
      Signed-off-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
      Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      Acked-by: default avatarDaniel Lezcano <daniel.lezcano@free.fr>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Cc: James Morris <jmorris@namei.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e795b717
    • Serge E. Hallyn's avatar
      userns: user namespaces: convert several capable() calls · b0e77598
      Serge E. Hallyn authored
      CAP_IPC_OWNER and CAP_IPC_LOCK can be checked against current_user_ns(),
      because the resource comes from current's own ipc namespace.
      
      setuid/setgid are to uids in own namespace, so again checks can be against
      current_user_ns().
      
      Changelog:
      	Jan 11: Use task_ns_capable() in place of sched_capable().
      	Jan 11: Use nsown_capable() as suggested by Bastian Blank.
      	Jan 11: Clarify (hopefully) some logic in futex and sched.c
      	Feb 15: use ns_capable for ipc, not nsown_capable
      	Feb 23: let copy_ipcs handle setting ipc_ns->user_ns
      	Feb 23: pass ns down rather than taking it from current
      
      [akpm@linux-foundation.org: coding-style fixes]
      Signed-off-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
      Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      Acked-by: default avatarDaniel Lezcano <daniel.lezcano@free.fr>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Cc: James Morris <jmorris@namei.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b0e77598
    • Serge E. Hallyn's avatar
      userns: add a user namespace owner of ipc ns · b515498f
      Serge E. Hallyn authored
      Changelog:
      	Feb 15: Don't set new ipc->user_ns if we didn't create a new
      		ipc_ns.
      	Feb 23: Move extern declaration to ipc_namespace.h, and group
      		fwd declarations at top.
      Signed-off-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
      Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      Acked-by: default avatarDaniel Lezcano <daniel.lezcano@free.fr>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Cc: James Morris <jmorris@namei.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b515498f
    • Serge E. Hallyn's avatar
      userns: user namespaces: convert all capable checks in kernel/sys.c · fc832ad3
      Serge E. Hallyn authored
      This allows setuid/setgid in containers.  It also fixes some corner cases
      where kernel logic foregoes capability checks when uids are equivalent.
      The latter will need to be done throughout the whole kernel.
      
      Changelog:
      	Jan 11: Use nsown_capable() as suggested by Bastian Blank.
      	Jan 11: Fix logic errors in uid checks pointed out by Bastian.
      	Feb 15: allow prlimit to current (was regression in previous version)
      	Feb 23: remove debugging printks, uninline set_one_prio_perm and
      		make it bool, and document its return value.
      Signed-off-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
      Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      Acked-by: default avatarDaniel Lezcano <daniel.lezcano@free.fr>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Cc: James Morris <jmorris@namei.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fc832ad3
    • Serge E. Hallyn's avatar
      userns: make has_capability* into real functions · 3263245d
      Serge E. Hallyn authored
      So we can let type safety keep things sane, and as a bonus we can remove
      the declaration of init_user_ns in capability.h.
      Signed-off-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
      Cc: "Eric W. Biederman" <ebiederm@xmission.com>
      Cc: Daniel Lezcano <daniel.lezcano@free.fr>
      Cc: David Howells <dhowells@redhat.com>
      Cc: James Morris <jmorris@namei.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3263245d