1. 16 Sep, 2009 18 commits
  2. 15 Sep, 2009 22 commits
    • Jens Axboe's avatar
      block: fix linkage problem with blk_iopoll and !CONFIG_BLOCK · cb684b5b
      Jens Axboe authored
       kernel/built-in.o:(.data+0x17b0): undefined reference to `blk_iopoll_enabled'
      
      Since the extern declaration makes the compile work, but the actual
      symbol is missing when block/blk-iopoll.o isn't linked in.
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      cb684b5b
    • Ingo Molnar's avatar
      slub: Fix build error in kmem_cache_open() with !CONFIG_SLUB_DEBUG · fdaa45e9
      Ingo Molnar authored
      This build bug:
      
       mm/slub.c: In function 'kmem_cache_open':
       mm/slub.c:2476: error: 'disable_higher_order_debug' undeclared (first use in this function)
       mm/slub.c:2476: error: (Each undeclared identifier is reported only once
       mm/slub.c:2476: error: for each function it appears in.)
      
      Triggers because there's no !CONFIG_SLUB_DEBUG definition for
      disable_higher_order_debug.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      fdaa45e9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 · 0cb583fd
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
        ide: fixup for fujitsu disk
        ide: convert to ->proc_fops
        at91_ide: remove headers specific for at91sam9263
        IDE: palm_bk3710: convert clock usage after clkdev conversion
        ide: fix races in handling of user-space SET XFER commands
        ide: allow ide_dev_read_id() to be called from the IRQ context
        ide: ide-taskfile.c fix style problems
        drivers/ide/ide-cd.c: Use DIV_ROUND_CLOSEST
        ide-tape: fix handling of postponed rqs
        ide-tape: convert to ide_debug_log macro
        ide-tape: fix debug call
        ide: Fix annoying warning in ide_pio_bytes().
        IDE: Save a call to PageHighMem()
      0cb583fd
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 723e9db7
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
        powerpc/nvram: Enable use Generic NVRAM driver for different size chips
        powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
        powerpc/ps3: Workaround for flash memory I/O error
        powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
        powerpc/perf_counters: Reduce stack usage of power_check_constraints
        powerpc: Fix bug where perf_counters breaks oprofile
        powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
        powerpc/irq: Improve nanodoc
        powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
        powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
        powerpc/book3e: Add missing page sizes
        powerpc/pseries: Fix to handle slb resize across migration
        powerpc/powermac: Thermal control turns system off too eagerly
        powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
        powerpc/405ex: support cuImage via included dtb
        powerpc/405ex: provide necessary fixup function to support cuImage
        powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
        powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
        powerpc/44x: Update Arches defconfig
        powerpc/44x: Update Arches dts
        ...
      
      Fix up conflicts in drivers/char/agp/uninorth-agp.c
      723e9db7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · ada3fa15
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)
        powerpc64: convert to dynamic percpu allocator
        sparc64: use embedding percpu first chunk allocator
        percpu: kill lpage first chunk allocator
        x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA
        percpu: update embedding first chunk allocator to handle sparse units
        percpu: use group information to allocate vmap areas sparsely
        vmalloc: implement pcpu_get_vm_areas()
        vmalloc: separate out insert_vmalloc_vm()
        percpu: add chunk->base_addr
        percpu: add pcpu_unit_offsets[]
        percpu: introduce pcpu_alloc_info and pcpu_group_info
        percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward
        percpu: add @align to pcpu_fc_alloc_fn_t
        percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()
        percpu: drop @static_size from first chunk allocators
        percpu: generalize first chunk allocator selection
        percpu: build first chunk allocators selectively
        percpu: rename 4k first chunk allocator to page
        percpu: improve boot messages
        percpu: fix pcpu_reclaim() locking
        ...
      
      Fix trivial conflict as by Tejun Heo in kernel/sched.c
      ada3fa15
    • Nicolas Pitre's avatar
      Nicolas Pitre has a new email address · 2f82af08
      Nicolas Pitre authored
      Due to problems at cam.org, my nico@cam.org email address is no longer
      valid.  FRom now on, nico@fluxnic.net should be used instead.
      Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2f82af08
    • Linus Torvalds's avatar
      Merge branch 'perfcounters-fixes-for-linus' of... · f199fd99
      Linus Torvalds authored
      Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf_counter: Fix buffer overflow in perf_copy_attr()
      f199fd99
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 043fe50f
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (213 commits)
        V4L/DVB (12720): em28xx-cards: Add vendor/product id for Kworld DVD Maker 2
        V4L/DVB (12713): em28xx: Cleanups at ir_i2c handler
        V4L/DVB (12712): em28xx: properly load ir-kbd-i2c when needed
        V4L/DVB (12701): saa7134: ir-kbd-i2c init data needs a persistent object
        V4L/DVB (12699): cx18: ir-kbd-i2c initialization data should point to a persistent object
        V4L/DVB (12698): em28xx: ir-kbd-i2c init data needs a persistent object
        V4L/DVB (12707): gspca - sn9c20x: Add SXGA support to MT9M111
        V4L/DVB (12706): gspca - sn9c20x: disable exposure/gain controls for MT9M111 sensors.
        V4L/DVB (12705): gspca - sn9c20x: Add SXGA support to SOI968
        V4L/DVB (12703): gspca - sn9c20x: Reduces size of object
        V4L/DVB (12704): gspca - sn9c20x: Fix exposure on SOI968 sensors
        V4L/DVB (12696): gspca - sonixj / sn9c102: Two drivers for 0c45:60fc and 0c45:613e.
        V4L/DVB (12695): gspca - vc032x: Do the LED work with the sensor hv7131r.
        V4L/DVB (12694): gspca - vc032x: Change the start exchanges of the sensor hv7131r.
        V4L/DVB (12693): gspca - sunplus: The brightness is signed.
        V4L/DVB (12692): gspca - sunplus: Optimize code.
        V4L/DVB (12691): gspca - sonixj: Don't use mdelay().
        V4L/DVB (12690): gspca - pac7311: Webcam 06f8:3009 added.
        V4L/DVB (12686): dvb-core: check supported QAM modulations
        V4L/DVB (12685): dvb-core: check fe->ops.set_frontend return value
        ...
      043fe50f
    • Linus Torvalds's avatar
      Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 22742390
      Linus Torvalds authored
      * 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, pat: Fix cacheflush address in change_page_attr_set_clr()
        mm: remove !NUMA condition from PAGEFLAGS_EXTENDED condition set
        x86: Fix earlyprintk=dbgp for machines without NX
        x86, pat: Sanity check remap_pfn_range for RAM region
        x86, pat: Lookup the protection from memtype list on vm_insert_pfn()
        x86, pat: Add lookup_memtype to get the current memtype of a paddr
        x86, pat: Use page flags to track memtypes of RAM pages
        x86, pat: Generalize the use of page flag PG_uncached
        x86, pat: Add rbtree to do quick lookup in memtype tracking
        x86, pat: Add PAT reserve free to io_mapping* APIs
        x86, pat: New i/f for driver to request memtype for IO regions
        x86, pat: ioremap to follow same PAT restrictions as other PAT users
        x86, pat: Keep identity maps consistent with mmaps even when pat_disabled
        x86, mtrr: make mtrr_aps_delayed_init static bool
        x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init
        generic-ipi: Allow cpus not yet online to call smp_call_function with irqs disabled
        x86: Fix an incorrect argument of reserve_bootmem()
        x86: Fix system crash when loading with "reservetop" parameter
      22742390
    • Linus Torvalds's avatar
      Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 1aaf2e59
      Linus Torvalds authored
      * 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, intel_txt: clean up the impact on generic code, unbreak non-x86
        x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
        x86, intel_txt: Fix typos in Kconfig help
        x86, intel_txt: Factor out the code for S3 setup
        x86, intel_txt: tboot.c needs <asm/fixmap.h>
        intel_txt: Force IOMMU on for Intel TXT launch
        x86, intel_txt: Intel TXT Sx shutdown support
        x86, intel_txt: Intel TXT reboot/halt shutdown support
        x86, intel_txt: Intel TXT boot support
      1aaf2e59
    • Linus Torvalds's avatar
      Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 · 66a4fe0c
      Linus Torvalds authored
      * 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
        agp/intel: remove restore in resume
        agp: fix uninorth build
        intel-agp: Set dma mask for i915
        agp: kill phys_to_gart() and gart_to_phys()
        intel-agp: fix sglist allocation to avoid vmalloc()
        intel-agp: Move repeated sglist free into separate function
        agp: Switch agp_{un,}map_page() to take struct page * argument
        agp: tidy up handling of scratch pages w.r.t. DMA API
        intel_agp: Use PCI DMA API correctly on chipsets new enough to have IOMMU
        agp: Add generic support for graphics dma remapping
        agp: Switch mask_memory() method to take address argument again, not page
      66a4fe0c
    • Wu Zhangjin's avatar
      ide: fixup for fujitsu disk · a2d10568
      Wu Zhangjin authored
      This patch will fix the following problem on Yeeloong netbook with
      fujitsu disk.
      
      irq 14: nobody cared (try booting with the "irqpoll" option)
      Call Trace:
      [<ffffffff8020d438>] dump_stack+0x8/0x40
      [<ffffffff8027ec64>] __report_bad_irq+0x58/0xe4
      [<ffffffff8027ee6c>] note_interrupt+0x17c/0x23c
      [<ffffffff8027f9b8>] handle_level_irq+0xcc/0x134
      [<ffffffff802125b0>] mach_irq_dispatch+0xb8/0x1e0
      [<ffffffff8020041c>] ret_from_irq+0x0/0x4
      [<ffffffff8029e678>] free_hot_cold_page+0x224/0x2a0
      [<ffffffff8026f794>] swsusp_free+0xb0/0x14c
      [<ffffffff8026ec08>] hibernate+0x198/0x218
      [<ffffffff8026cfa8>] state_store+0x90/0x138
      [<ffffffff8032b5a4>] sysfs_write_file+0x130/0x194
      [<ffffffff802c94fc>] vfs_write+0xb8/0x180
      [<ffffffff802c96b8>] SyS_write+0x50/0x98
      [<ffffffff80203fd8>] handle_sys+0x158/0x174
      
      handlers:
      [<ffffffff80429670>] (ide_intr+0x0/0x300)
      Disabling IRQ #14
      
      References:
      
      1. commit 1fde02e7146d4a1bab80fd1506f9018fe71e8521 of
      git://dev.lemote.com/linux_loongson.git
      2. 8bc1e5aa (ide: respect quirk_drives[]
      list on all controllers)
      Signed-off-by: default avatarYan Hua <yanh@lemote.com>
      Signed-off-by: default avatarWu Zhangjin <wuzhangjin@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a2d10568
    • Xiao Guangrong's avatar
      perf_counter: Fix buffer overflow in perf_copy_attr() · b3e62e35
      Xiao Guangrong authored
      If we pass a big size data over perf_counter_open() syscall,
      the kernel will copy this data to a small buffer, it will
      cause kernel crash.
      
      This bug makes the kernel unsafe and non-root local user can
      trigger it.
      Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
      Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
      Acked-by: default avatarPaul Mackerras <paulus@samba.org>
      Cc: <stable@kernel.org>
      LKML-Reference: <4AAF37D4.5010706@cn.fujitsu.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      b3e62e35
    • Linus Torvalds's avatar
      Merge branch 'for-linus3' of... · 18240904
      Linus Torvalds authored
      Merge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
        SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX
        KEYS: Fix garbage collector
        KEYS: Unlock tasklist when exiting early from keyctl_session_to_parent
        CRED: Allow put_cred() to cope with a NULL groups list
        SELinux: flush the avc before disabling SELinux
        SELinux: seperate avc_cache flushing
        Creds: creds->security can be NULL is selinux is disabled
      18240904
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · f86054c2
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (23 commits)
        at_hdmac: Rework suspend_late()/resume_early()
        PM: Reset transition_started at dpm_resume_noirq
        PM: Update kerneldoc comments in drivers/base/power/main.c
        PM: Add convenience macro to make switching to dev_pm_ops less error-prone
        hp-wmi: Switch driver to dev_pm_ops
        floppy: Switch driver to dev_pm_ops
        PM: Trivial fixes
        PM / Hibernate / Memory hotplug: Always use for_each_populated_zone()
        PM/Hibernate: Do not try to allocate too much memory too hard (rev. 2)
        PM/Hibernate: Do not release preallocated memory unnecessarily (rev. 2)
        PM/Hibernate: Rework shrinking of memory
        PM: Fix typo in label name s/Platofrm_finish/Platform_finish/
        PM: Run-time PM platform device bus support
        PM: Introduce core framework for run-time PM of I/O devices (rev. 17)
        Driver Core: Make PM operations a const pointer
        PM: Remove platform device suspend_late()/resume_early() V2
        USB: Rework musb suspend()/resume_early()
        I2C: Rework i2c-s3c2410 suspend_late()/resume() V2
        I2C: Rework i2c-pxa suspend_late()/resume_early()
        DMA: Rework txx9dmac suspend_late()/resume_early()
        ...
      
      Fix trivial conflict in drivers/base/platform.c (due to same
      constification patch being merged in both sides, along with some other
      PM work in the PM branch)
      f86054c2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig · c91d7d54
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
        kconfig: add missing dependency of conf to localyesconfig
        kconfig: test if a .config already exists
        kconfig: make local .config default for streamline_config
        kconfig: test for /boot/config-uname after /proc/config.gz in localconfig
        kconfig: unset IKCONFIG_PROC and clean up nesting
        kconfig: search for a config to base the local(mod|yes)config on
        kconfig: keep config.gz around even if CONFIG_IKCONFIG_PROC is not set
        kconfig: have extract-ikconfig read ELF files
        kconfig: add check if end exists in extract-ikconfig
        kconfig: enable CONFIG_IKCONFIG from streamline_config.pl
        kconfig: do not warn about modules built in
        kconfig: streamline_config.pl do not stop with no depends
        kconfig: add make localyesconfig option
        kconfig: make localmodconfig to run streamline_config.pl
        kconfig: add streamline_config.pl to scripts
      c91d7d54
    • Douglas Schilling Landgraf's avatar
      V4L/DVB (12720): em28xx-cards: Add vendor/product id for Kworld DVD Maker 2 · ea47689e
      Douglas Schilling Landgraf authored
      Added Kworld DVD Maker 2
      Thanks to C Western <l@c-m-w.me.uk> for reporting this board.
      Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      ea47689e
    • Eric Paris's avatar
      SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX · 8a478905
      Eric Paris authored
      Without this patch building a kernel emits millions of warning like:
      
      include/linux/selinux.h:92: warning: ?selinux_is_enabled? defined but not used
      
      When it is build without CONFIG_SECURITY_SELINUX.  This is harmless, but
      the function should be inlined, so it gets compiled out.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarEric Paris <eparis@redhat.com>
      Signed-off-by: default avatarJames Morris <jmorris@namei.org>
      8a478905
    • Tejun Heo's avatar
      Merge branch 'for-next' into for-linus · 5579fd7e
      Tejun Heo authored
      * pcpu_chunk_page_occupied() doesn't exist in for-next.
      * pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
      
      Conflicts:
      	mm/percpu.c
      5579fd7e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 133309a8
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (52 commits)
        Input: bcm5974 - silence uninitialized variables warnings
        Input: wistron_btns - add keymap for AOpen 1557
        Input: psmouse - use boolean type
        Input: i8042 - use platform_driver_probe
        Input: i8042 - use boolean type where it makes sense
        Input: i8042 - try disabling and re-enabling AUX port at close
        Input: pxa27x_keypad - allow modifying keymap from userspace
        Input: sunkbd - fix formatting
        Input: i8042 - bypass AUX IRQ delivery test on laptops
        Input: wacom_w8001 - simplify querying logic
        Input: atkbd - allow setting force-release bitmap via sysfs
        Input: w90p910_keypad - move a dereference below a NULL test
        Input: add twl4030_keypad driver
        Input: matrix-keypad - add function to build device keymap
        Input: tosakbd - fix cleaning up KEY_STROBEs after error
        Input: joydev - validate axis/button maps before clobbering current ones
        Input: xpad - add USB ID for the drumkit controller from Rock Band
        Input: w90p910_keypad - rename driver name to match platform
        Input: add new driver for Sentelic Finger Sensing Pad
        Input: psmouse - allow defining read-only attributes
        ...
      133309a8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 5489375d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: completely remove apple mightymouse from blacklist
        HID: support larger reports than 64 bytes in hiddev
        HID: local function should be static
        HID: ignore Philips IEEE802.15.4 RF Dongle
        HID: ignore all recent SoundGraph iMON devices
        HID: fix memory leak on error patch in debug code
        HID: fix overrun in quirks initialization
        HID: Drop NULL test on list_entry result
        HID: driver for Twinhan USB 6253:0100 remote control
        HID: adding __init/__exit macros to module init/exit functions
        HID: add rumble support for Thrustmaster Dual Trigger 3-in-1
        HID: ntrig tool separation and pen usages
        HID: Avoid double spin_lock_init on usbhid->lock
        HID: add force feedback support for Logitech WingMan Formula Force GP
        HID: Support new variants of Samsung USB IR receiver (0419:0001)
        HID: fix memory leak on error path in debug code
        HID: fix debugfs build with !CONFIG_DEBUG_FS
        HID: use debugfs for events/reports dumping
        HID: use debugfs for report dumping descriptor
      5489375d
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block · 355bbd8c
      Linus Torvalds authored
      * 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block: (29 commits)
        block: use blkdev_issue_discard in blk_ioctl_discard
        Make DISCARD_BARRIER and DISCARD_NOBARRIER writes instead of reads
        block: don't assume device has a request list backing in nr_requests store
        block: Optimal I/O limit wrapper
        cfq: choose a new next_req when a request is dispatched
        Seperate read and write statistics of in_flight requests
        aoe: end barrier bios with EOPNOTSUPP
        block: trace bio queueing trial only when it occurs
        block: enable rq CPU completion affinity by default
        cfq: fix the log message after dispatched a request
        block: use printk_once
        cciss: memory leak in cciss_init_one()
        splice: update mtime and atime on files
        block: make blk_iopoll_prep_sched() follow normal 0/1 return convention
        cfq-iosched: get rid of must_alloc flag
        block: use interrupts disabled version of raise_softirq_irqoff()
        block: fix comment in blk-iopoll.c
        block: adjust default budget for blk-iopoll
        block: fix long lines in block/blk-iopoll.c
        block: add blk-iopoll, a NAPI like approach for block devices
        ...
      355bbd8c