1. 07 4月, 2011 4 次提交
  2. 31 3月, 2011 3 次提交
  3. 29 3月, 2011 3 次提交
  4. 25 3月, 2011 12 次提交
  5. 24 3月, 2011 18 次提交
    • L
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 047f61c5
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 05061bf6
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 · fdc0ad80
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux · dc87c551
      Linus Torvalds 提交于
      * '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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus · 5818fcc8
      Linus Torvalds 提交于
      * 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
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 0625bef6
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · a6a1d648
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 1b506cfb
      Linus Torvalds 提交于
      * '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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 · 4cc4d24e
      Linus Torvalds 提交于
      * 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
    • A
      UBIFS: fix assertion warning and refine comments · 6ed09c34
      Artem Bityutskiy 提交于
      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: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      6ed09c34
    • A
      UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS · 9d523caf
      Artem Bityutskiy 提交于
      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: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      9d523caf
    • A
      UBIFS: use GFP_NOFS properly · fc5e58c0
      Artem Bityutskiy 提交于
      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: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      fc5e58c0
    • A
      UBI: use GFP_NOFS properly · 3d46b316
      Artem Bityutskiy 提交于
      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: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      3d46b316
    • N
      sh: Fix build alloc_thread_info_node function · b15ed691
      Nobuhiro Iwamatsu 提交于
      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: NNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
      CC: Eric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      b15ed691
    • P
      Merge branch 'master' of... · a3d33622
      Paul Mundt 提交于
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
      a3d33622
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · b81a618d
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 2f284c84
      Linus Torvalds 提交于
      * '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