17 Aug, 2008

9 commits

  • The drivers below do not use LINUX_VERSION_CODE nor KERNEL_VERSION.
    drivers/char/pcmcia/ipwireless/tty.c
    drivers/char/synclink_gt.c
    drivers/char/xilinx_hwicap/xilinx_hwicap.c

    This patch removes the said #include .

    Signed-off-by: Huang Weiyi
    Signed-off-by: Linus Torvalds

    Huang Weiyi
     
  • …/git/tip/linux-2.6-tip

    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    lockdep: fix build if CONFIG_PROVE_LOCKING not defined
    lockdep: use WARN() in kernel/lockdep.c
    lockdep: spin_lock_nest_lock(), checkpatch fixes
    lockdep: build fix

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: scale sysctl_sched_shares_ratelimit with nr_cpus
    sched: fix rt-bandwidth hotplug race
    sched: fix the race between walk_tg_tree and sched_create_group

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits)
    x86: add MAP_STACK mmap flag
    x86: fix section mismatch warning - spp_getpage()
    x86: change init_gdt to update the gdt via write_gdt, rather than a direct write.
    x86-64: fix overlap of modules and fixmap areas
    x86, geode-mfgpt: check IRQ before using MFGPT as clocksource
    x86, acpi: cleanup, temp_stack is used only when CONFIG_SMP is set
    x86: fix spin_is_contended()
    x86, nmi: clean UP NMI watchdog failure message
    x86, NMI: fix watchdog failure message
    x86: fix /proc/meminfo DirectMap
    x86: fix readb() et al compile error with gcc-3.2.3
    arch/x86/Kconfig: clean up, experimental adjustement
    x86: invalidate caches before going into suspend
    x86, perfctr: don't use CCCR_OVF_PMI1 on Pentium 4Ds
    x86, AMD IOMMU: initialize dma_ops after sysfs registration
    x86m AMD IOMMU: cleanup: replace LOW_U32 macro with generic lower_32_bits
    x86, AMD IOMMU: initialize device table properly
    x86, AMD IOMMU: use status bit instead of memory write-back for completion wait
    x86: silence mmconfig printk
    x86, msr: fix NULL pointer deref due to msr_open on nonexistent CPUs
    ...

    Linus Torvalds
     
  • I noticed that sysctl_check.o was the largest object file in
    a allnoconfig build in kernel/*.

    36243 0 0 36243 8d93 kernel/sysctl_check.o

    This is because it was default y and && EMBEDDED. But I don't
    really see a need for a non kernel developer to have their
    sysctls checked all the time.

    So move the Kconfig into the kernel debugging section and
    also drop the default y and the EMBEDDED check.

    Signed-off-by: Andi Kleen
    Signed-off-by: Linus Torvalds

    Andi Kleen
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm: (38 commits)
    [ARM] 5191/1: ARM: remove CVS keywords
    [ARM] pxafb: fix the warning of incorrect lccr when lcd_conn is specified
    [ARM] pxafb: add flag to specify output format on LDD pins when base is RGBT16
    [ARM] pxafb: fix the incorrect configuration of GPIO77 as ACBIAS for TFT LCD
    [ARM] 5198/1: PalmTX: PCMCIA fixes
    [ARM] Fix a pile of broken watchdog drivers
    [ARM] update mach-types
    [ARM] 5196/1: fix inline asm constraints for preload
    [ARM] 5194/1: update .gitignore
    [ARM] add proc-macros.S include to proc-arm940 and proc-arm946
    [ARM] 5192/1: ARM TLB: add v7wbi_{possible,always}_flags to {possible,always}_tlb_flags
    [ARM] 5193/1: Wire up missing syscalls
    [ARM] traps: don't call undef hook functions with spinlock held
    [ARM] 5183/2: Provide Poodle LoCoMo GPIO names
    [ARM] dma-mapping: provide sync_range APIs
    [ARM] dma-mapping: improve type-safeness of DMA translations
    [ARM] Kirkwood: instantiate the orion_spi driver in the platform code
    [ARM] prevent crashing when too much RAM installed
    [ARM] Kirkwood: Instantiate mv_xor driver
    [ARM] Orion: Instantiate mv_xor driver for 5182
    ...

    Linus Torvalds
     
  • The exported copy of videodev2.h contains this line:

    #define #include

    This is because for some reason it defines __user for itself -- despite
    the fact that we remove all instances of __user when exporting headers.
    _All_ pointers in userspace are user pointers. Fix it by removing the
    unnecessary '#define __user' from the file.

    The new headers ivtv.h and ivtvfb.h would have the same problem... if
    whoever put them there had actually remembered to add them to the Kbuild
    file while he was at it. Fix those too, and export them as was
    presumably intended.

    Note that includes of are also stripped by the header
    export process, so those don't need to be conditional.

    Signed-off-by: David Woodhouse
    Signed-off-by: Mauro Carvalho Chehab
    Acked-by: Hans Verkuil
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • Try to comment away a little of the confusion between mm's vm_area_struct
    vm_flags and vmalloc's vm_struct flags: based on an idea by Ulrich Drepper.

    Signed-off-by: Hugh Dickins
    Signed-off-by: Linus Torvalds

    Hugh Dickins
     
  • This patch removes CVS keywords that weren't updated for a long time.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Russell King

    Adrian Bunk
     

16 Aug, 2008

31 commits

  • The newly introduced "lcd_conn" field for connected LCD panel type will
    cause the original code to generate the warnings of incorrect lccr*.
    This is unnecessary since well encoded LCD_* flags will not generate
    incorrect combinition of lccr* bits. Skip the check if "lcd_conn" is
    specified.

    Signed-off-by: Eric Miao
    Signed-off-by: Russell King

    Eric Miao
     
  • Another fix of inconsistent shift of the LCD_BIAS_ACTIVE_* and
    LCD_PCLK_EDGE_* is also included.

    Signed-off-by: Eric Miao
    Signed-off-by: Russell King

    Eric Miao
     
  • Signed-off-by: Eric Miao
    Tested-by: Robert Jarzmik
    Tested-by: Alex Osborne
    Signed-off-by: Russell King

    Eric Miao
     
  • Fix GPIO handling in the PCMCIA driver.

    Signed-off-by: Marek Vasut
    Signed-off-by: Russell King

    Marek Vašut
     
  • These patches from Adrian fix:
    - ixp4xx_wdt: 20d35f3e50ea7e573f9568b9fce4e98523aaee5d
    CC drivers/watchdog/ixp4xx_wdt.o
    ixp4xx_wdt.c:32: error: expected '=', ',', ';', 'asm' or '__attribute__'
    ixp4xx_wdt.c: In function 'wdt_enable':
    ixp4xx_wdt.c:41: error: 'wdt_lock' undeclared (first use in this
    ixp4xx_wdt.c:41: error: (Each undeclared identifier is reported only
    ixp4xx_wdt.c:41: error: for each function it appears in.)
    ixp4xx_wdt.c: In function 'wdt_disable':
    ixp4xx_wdt.c:52: error: 'wdt_lock' undeclared (first use in this
    ixp4xx_wdt.c: In function 'ixp4xx_wdt_init':
    ixp4xx_wdt.c:186: error: 'wdt_lock' undeclared (first use in this
    make[3]: *** [drivers/watchdog/ixp4xx_wdt.o] Error 1

    - at91rm9200_wdt: 2760600da2a13d5a2a335ba012d0f3ad5df4c098
    CC drivers/watchdog/at91rm9200_wdt.o
    at91rm9200_wdt.c:188: error: 'at91_wdt_ioctl' undeclared here (not in a
    make[3]: *** [drivers/watchdog/at91rm9200_wdt.o] Error 1

    - wdt285: d0e58eed05f9baf77c4f75e794ae245f6dae240a
    CC [M] drivers/watchdog/wdt285.o
    wdt285.c: In function 'footbridge_watchdog_init':
    wdt285.c:211: error: 'KERN_WARN' undeclared (first use in this function)
    wdt285.c:211: error: (Each undeclared identifier is reported only once
    wdt285.c:211: error: for each function it appears in.)
    wdt285.c:212: error: expected ')' before string constant
    make[3]: *** [drivers/watchdog/wdt285.o] Error 1

    And this patch from rmk:
    - s3c2410_wdt: 41dc8b72e37c514f7332cbc3f3dd864910c2a1fa
    CC drivers/watchdog/s3c2410_wdt.o
    s3c2410_wdt.c: In function `s3c2410wdt_start':
    s3c2410_wdt.c:161: warning: `return' with a value, in function returning void

    Reported-by: Adrian Bunk
    Signed-off-by: Adrian Bunk
    Signed-off-by: Russell King

    Adrian Bunk
     
  • Signed-off-by: Russell King

    Russell King
     
  • With gcc 4.3 and later, a pointer that has already been dereferenced is
    assumed not to be null since it should have caused a segmentation fault
    otherwise, hence any subsequent test against NULL is optimized away.

    Current inline asm constraint used in the implementation of prefetch()
    makes gcc believe that the pointer is dereferenced even though the PLD
    instruction does not load any data and does not cause a segmentation
    fault on null pointers, which causes all sorts of interesting results
    when reaching the end of a linked lists for example.

    Let's use a better constraint to properly represent the actual usage of
    the pointer value.

    Problem reported by Chris Steel.

    Signed-off-by: Nicolas Pitre
    Signed-off-by: Russell King

    Nicolas Pitre
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    security: Fix setting of PF_SUPERPRIV by __capable()

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (33 commits)
    Blackfin arch: hook up some missing new system calls
    Blackfin arch: fix missing digit in SCLK range checking
    Blackfin arch: do not muck with the UART during boot -- let the serial driver worry about it
    Blackfin arch: clear EMAC_SYSTAT during IRQ init rather than early head.S as we dont need it setup that early
    Blackfin arch: use %pF when printing out the double fault address so we get symbol names
    Blackfin arch: add support for the BlackStamp board
    Blackfin arch: Allow ins functions to have a low latency version
    Blackfin arch: Print out doublefault addresses, so debug can occur
    Blackfin arch: shuffle related prototypes together -- no functional changes
    Blackfin arch: move fixed code defines into fixed_code.h as very few things actually need to know these details
    Blackfin arch: mark some functions as __init as they are only called from __init functions
    Blackfin arch: delete dead prototypes
    Blackfin arch: cleanup cache lock code
    Blackfin arch: workaround SIC_IWR1 reset bug, by keeping MDMA0/1 always enabled in SIC_IWR1.
    Blackfin arch: Fix bug - when expanding the trace buffer, it does not print out the decoded instruction.
    Blackfin arch: Fix Bug - System with EMAC driver enabled - Core not idling
    Blackfin arch: delete unused cache functions
    Blackfin arch: convert L2 defines to be the same as the L1 defines
    Blackfin arch: unify the duplicated portions of __start and split mach-specific pieces into _mach_early_start where they will be easier to trim over time
    Blackfin arch: add asm/thread_info.h for THREAD_SIZE define
    ...

    Linus Torvalds
     
  • * 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6:
    cpuidle: Make ladder governor honor latency requirements fully
    cpuidle: Menu governor fix wrong usage of measured_us
    cpuidle: Do not use poll_idle unless user asks for it
    x86: Fix ioremap off by one BUG

    Linus Torvalds
     
  • Andi Kleen
     
  • ladder governor only honored latency requirement when promoting C-states.
    Instead. it should check for latency requirement on each idle call,
    and demote to appropriate C-state when there is a latency requirement change.

    Signed-off-by: Venkatesh Pallipadi
    Signed-off-by: Andi Kleen

    venkatesh.pallipadi@intel.com
     
  • There is a bug in menu governor where we have
    if (data->elapsed_us < data->elapsed_us + measured_us)

    with measured_us already having elapsed_us added in tickless case here
    unsigned int measured_us =
    cpuidle_get_last_residency(dev) + data->elapsed_us;

    Also, it should be last_residency, not measured_us, that need to be used to
    do comparing and distinguish between expected & non-expected events.

    Refactor menu_reflect() to fix these two problems.

    Signed-off-by: Venkatesh Pallipadi
    Signed-off-by: Wei Gang
    Signed-off-by: Andi Kleen

    venkatesh.pallipadi@intel.com
     
  • poll_idle was added to CPUIDLE, just as a low latency idle handler, to be
    used in cases when user desires CPUs not to enter any idle state at all. It
    was supposed to be a run time idle=poll option to the user. But, it was indeed
    getting used during normal menu and ladder governor default case, with no
    special user setting (Reported by Linus Torvalds).

    Change below ensures that poll_idle will not be used unless user explicitly
    asks pm_qos infrastructure for zero latency requirement.

    Signed-off-by: Venkatesh Pallipadi
    Signed-off-by: Andi Kleen

    venkatesh.pallipadi@intel.com
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: wm8990: Implement speaker volume PGA
    ALSA: wm8990: Fix routing of left DAC to speaker mixer
    ALSA: virtuoso: add Xonar D1 support

    Linus Torvalds
     
  • Not all AMD K8 have 6 VID pins, contrary to what was assumed in
    commit 116d0486bdefc11f71e567cadf0c47f788b4dd06. This commit broke
    support of older CPU models which have only 5 VID pins:
    http://bugzilla.kernel.org/show_bug.cgi?id=11329

    We need two entries in the hwmon-vid table, one for 5-bit VID models
    (K8 revision = F).
    This fixes bug #11329.

    Signed-off-by: Jean Delvare
    Acked-by: Frank Myhr
    Tested-by: Jean-Luc Coulon
    Signed-off-by: Linus Torvalds

    Jean Delvare
     
  • as per this discussion:

    http://lkml.org/lkml/2008/8/12/423

    Pardo reported that 64-bit threaded apps, if their stacks exceed the
    combined size of ~4GB, slow down drastically in pthread_create() - because
    glibc uses MAP_32BIT to allocate the stacks. The use of MAP_32BIT is
    a legacy hack - to speed up context switching on certain early model
    64-bit P4 CPUs.

    So introduce a new flag to be used by glibc instead, to not constrain
    64-bit apps like this.

    glibc can switch to this new flag straight away - it will be ignored
    by the kernel. If those old CPUs ever matter to anyone, support for
    it can be implemented.

    Signed-off-by: Ingo Molnar
    Acked-by: Ulrich Drepper
    Signed-off-by: Linus Torvalds

    Ingo Molnar
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    [CIFS] mount of IPC$ breaks with iget patch
    [CIFS] remove trailing whitespace
    [CIFS] if get root inode fails during mount, cleanup tree connection

    Linus Torvalds
     
  • Andi Kleen
     
  • This moves it to being a tty operation. That removes special cases and now
    also means that resize can be picked up by um and other non vt consoles
    which may have a resize operation.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • * 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6: (29 commits)
    UBIFS: xattr bugfixes
    UBIFS: remove unneeded check
    UBIFS: few commentary fixes
    UBIFS: fix budgeting request alignment in xattr code
    UBIFS: improve arguments checking in debugging messages
    UBIFS: always set i_generation to 0
    UBIFS: correct spelling of "thrice".
    UBIFS: support splice_write
    UBIFS: minor tweaks in commit
    UBIFS: reserve more space for index
    UBIFS: print pid in dump function
    UBIFS: align inode data to eight
    UBIFS: improve budgeting checks
    UBIFS: correct orphan deletion order
    UBIFS: fix typos in comments
    UBIFS: do not union creat_sqnum and del_cmtno
    UBIFS: optimize deletions
    UBIFS: increment commit number earlier
    UBIFS: remove another unneeded function parameter
    UBIFS: remove unneeded function parameter
    ...

    Linus Torvalds
     
  • If CONFIG_PROVE_LOCKING not defined, then no dependency information
    is available.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Ingo Molnar

    Stephen Hemminger
     
  • as per this discussion:

    http://lkml.org/lkml/2008/8/12/423

    Pardo reported that 64-bit threaded apps, if their stacks exceed the
    combined size of ~4GB, slow down drastically in pthread_create() - because
    glibc uses MAP_32BIT to allocate the stacks. The use of MAP_32BIT is
    a legacy hack - to speed up context switching on certain early model
    64-bit P4 CPUs.

    So introduce a new flag to be used by glibc instead, to not constrain
    64-bit apps like this.

    glibc can switch to this new flag straight away - it will be ignored
    by the kernel. If those old CPUs ever matter to anyone, support for
    it can be implemented.

    Signed-off-by: Ingo Molnar
    Acked-by: Ulrich Drepper

    Ingo Molnar
     
  • WARNING: vmlinux.o(.text+0x17a3e): Section mismatch in reference from the function set_pte_vaddr_pud() to the function .init.text:spp_getpage()
    The function set_pte_vaddr_pud() references
    the function __init spp_getpage().
    This is often because set_pte_vaddr_pud lacks a __init
    annotation or the annotation of spp_getpage is wrong.

    spp_getpage is called from __init (__init_extra_mapping) and
    non __init (set_pte_vaddr_pud) functions, so it can't be __init.
    Unfortunately it calls alloc_bootmem_pages which is __init,
    but does it only when bootmem allocator is available (after_bootmem == 0).

    So annotate it accordingly.

    Signed-off-by: Marcin Slusarz
    Signed-off-by: Ingo Molnar
    Cc: H. Peter Anvin

    Marcin Slusarz
     
  • By writing directly, a memory access violation can occur whilst
    hotplugging a CPU if the entry was previously marked read-only.

    Signed-off-by: Alex Nixon
    Cc: Jeremy Fitzhardinge
    Signed-off-by: Ingo Molnar

    Alex Nixon
     
  • * 'for-linus' of git://neil.brown.name/md:
    md: cancel check/repair requests when recovery is needed
    Allow raid10 resync to happening in larger chunks.
    Allow faulty devices to be removed from a readonly array.
    Don't let a blocked_rdev interfere with read request in raid5/6
    Fail safely when trying to grow an array with a write-intent bitmap.
    Restore force switch of md array to readonly at reboot time.
    Make writes to md/safe_mode_delay immediately effective.

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: xilinx_ps2 - fix warning
    Input: bcm5974 - implement autosuspend support
    Input: bcm5974 - add driver for Macbook Air and Pro Penryn touchpads
    Input: paper over a bug in Synaptics X driver
    Input: evdev - split EVIOCGBIT handlig into a separate function
    Input: i8042 - Add Dritek quirk for Acer TravelMate 4280
    Input: xpad - add Pelican Eclipse D-Pad to the list of devices
    Input: gpio-keys - make gpio_keys_device_driver static
    Input: gpio-keys - fix possible NULL pointer dereference
    Input: wm97xx - enable sub-drivers by default

    Linus Torvalds
     
  • * 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6:
    ACPI: Fix thermal shutdowns
    ACPI: bounds check IRQ to prevent memory corruption
    ACPI: Avoid bogus EC timeout when EC is in Polling mode
    ACPI : Add the EC dmi table to fix the incorrect ECDT table
    ACPI: Properly clear flags on false-positives and send uevent on sudden unplug
    acpi: trivial cleanups
    acer-wmi: Fix wireless and bluetooth on early AMW0 v2 laptops
    ACPI: WMI: Set instance for query block calls
    ACPICA: Additional error checking for pathname utilities
    ACPICA: Fix possible memory leak in Unload() operator
    ACPICA: Fix memory leak when deleting thermal/processor objects

    Linus Torvalds
     
  • David reported that his Niagra spend a little too much time in
    tg_shares_up(), which considering he has a large cpu count makes sense.

    So scale the ratelimit value with the number of cpus like we do for
    other controls as well.

    Reported-by: David Miller
    Signed-off-by: Peter Zijlstra
    Signed-off-by: Ingo Molnar

    Peter Zijlstra
     
  • Sam Ravnborg did the build-test that the direct header file move works,
    I'm just committing it.

    This is a pure move:

    mkdir arch/alpha/include
    git mv include/asm-alpha arch/alpha/include/asm

    with no other changes.

    Requested-and-tested-by: Sam Ravnborg
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Jean Delvare's machine triggered this BUG

    acpi_os_map_memory phys ffff0000 size 65535
    ------------[ cut here ]------------
    kernel BUG at arch/x86/mm/pat.c:233!

    with ACPI in the backtrace.

    Adding some debugging output showed that ACPI calls

    acpi_os_map_memory phys ffff0000 size 65535

    And ioremap/PAT does this check in 32bit, so addr+size wraps and the BUG
    in reserve_memtype() triggers incorrectly.

    BUG_ON(start >= end); /* end is exclusive */

    But reserve_memtype already uses u64:

    int reserve_memtype(u64 start, u64 end,

    so the 32bit truncation must happen in the caller. Presumably in ioremap
    when it passes this information to reserve_memtype().

    This patch does this computation in 64bit.

    http://bugzilla.kernel.org/show_bug.cgi?id=11346

    Signed-off-by: Andi Kleen

    Andi Kleen