06 Dec, 2007

1 commit

  • Given the patch which simplifies the spi_sync calling convention, this one
    updates the callers of that routine which tried using it according to the
    previous specification. (Most didn't.)

    Signed-off-by: Marc Pignat
    Signed-off-by: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Marc Pignat
     

28 Nov, 2007

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: adds the context menu key (HUT GenDesc 0x84)
    Input: add definitions for frame forward and frame back keys
    Input: bf54x-keys - keypad does not exist on BF544 parts
    Input: gpio-keys - request and configure GPIOs
    Input: i8042 - add i8042.noloop quirk for MS Virtual Machine
    Sonypi: use synchronize_irq instead of sycnronize_sched
    sonypi: fit input devices into sysfs tree
    sony-laptop: fit input devices into sysfs tree

    Linus Torvalds
     

27 Nov, 2007

1 commit


23 Nov, 2007

1 commit


22 Nov, 2007

2 commits


03 Nov, 2007

1 commit

  • The Jazz machines have to use the PIT timer for dyntick and highresolution
    kernels. This may break because currently just like i386 used to do MIPS
    uses two separate spinlocks in the actual PIT code and the PC speaker
    code. So switch to do it the same that x86 currently does PIT locking.

    Signed-off-by: Ralf Baechle
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     

02 Nov, 2007

2 commits

  • Many mouse drivers are often compiled (e.g. in Linux distributions) into the
    kernel at the same time just to make sure that at least one driver will suceed
    in find it's mouse device. Nevertheless, only the inport and logitech busmouse
    mouse drivers report with KERN_ERR log level if the mouse wasn't found. They
    should use KERN_INFO instead, because it's not an error if the mouse isn't
    attached at all.

    Signed-off-by: Helge Deller
    Signed-off-by: Dmitry Torokhov

    Helge Deller
     
  • Fountains do not support change mode request and therefore
    should be excluded from idle reset attempts.

    Also:
    - do not re-submit URB when we decide that touchpad needs to be
    reinicialized
    - do not repeat size detection when reinitializing the touchpad
    - Add missing KERN_* prefixes to messages

    Signed-off-by: Dmitry Torokhov
    Acked-by: Johannes Berg

    Dmitry Torokhov
     

28 Oct, 2007

2 commits


24 Oct, 2007

1 commit


23 Oct, 2007

1 commit


22 Oct, 2007

4 commits


20 Oct, 2007

9 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
    fix do_sys_open() prototype
    sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
    Documentation: Fix typo in SubmitChecklist.
    Typo: depricated -> deprecated
    Add missing profile=kvm option to Documentation/kernel-parameters.txt
    fix typo about TBI in e1000 comment
    proc.txt: Add /proc/stat field
    small documentation fixes
    Fix compiler warning in smount example program from sharedsubtree.txt
    docs/sysfs: add missing word to sysfs attribute explanation
    documentation/ext3: grammar fixes
    Documentation/java.txt: typo and grammar fixes
    Documentation/filesystems/vfs.txt: typo fix
    include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
    trivial copy_data_pages() tidy up
    Fix typo in arch/x86/kernel/tsc_32.c
    file link fix for Pegasus USB net driver help
    remove unused return within void return function
    Typo fixes retrun -> return
    x86 hpet.h: remove broken links
    ...

    Linus Torvalds
     
  • Most of these fixes were already submitted for old kernel versions, and were
    approved, but for some reason they never made it into the releases.

    Because this is a consolidation of a couple old missed patches, it touches both
    Kconfigs and documentation texts.

    Signed-off-by: Matt LaPlante
    Acked-by: Randy Dunlap
    Signed-off-by: Adrian Bunk

    Matt LaPlante
     
  • Changed email address of Johann Deneux (myself)
    Also removed CVS tags in comments (no longer using cvs)

    Signed-off-by: Johann Deneux
    Signed-off-by: Adrian Bunk

    Johann Deneux
     
  • * ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (33 commits)
    x86: convert cpuinfo_x86 array to a per_cpu array
    x86: introduce frame_pointer() and stack_pointer()
    x86 & generic: change to __builtin_prefetch()
    i386: do not BUG_ON() when MSR is unknown
    x86: acpi use cpu_physical_id
    x86: convert cpu_llc_id to be a per cpu variable
    x86: convert cpu_to_apicid to be a per cpu variable
    i386: introduce "used_vectors" bitmap which can be used to reserve vectors.
    x86: use raw locks during oopses
    x86: honor _PAGE_PSE bit on page walks
    i386: do cpuid_device_create() in CPU_UP_PREPARE instead of CPU_ONLINE.
    x86: implement missing x86_64 function smp_call_function_mask()
    x86: use descriptor's functions instead of inline assembly
    i386: consolidate show_regs and show_registers for i386
    i386: make callgraph use dump_trace() on i386/x86_64
    x86: enable iommu_merge by default
    i386: i386 add AMD64 Barcelona PMU MSR definitions to msr.h
    x86: Unify i386 and x86-64 early quirks
    x86: enable HPET on ICH3 and ICH4
    x86: force enable HPET on VT8235/8237 chipsets
    ...

    Manually fix trivial conflict with task pid container helper changes in
    arch/x86/kernel/process_32.c

    Linus Torvalds
     
  • From: Jean Delvare

    Signed-off-by: Jean Delvare
    Signed-off-by: Adrian Bunk

    Jean Delvare
     
  • * Convert files to UTF-8.

    * Also correct some people's names
    (one example is Eißfeldt, which was found in a source file.
    Given that the author used an ß at all in a source file
    indicates that the real name has in fact a 'ß' and not an 'ss',
    which is commonly used as a substitute for 'ß' when limited to
    7bit.)

    * Correct town names (Goettingen -> Göttingen)

    * Update Eberhard Mönkeberg's address (http://lkml.org/lkml/2007/1/8/313)

    Signed-off-by: Jan Engelhardt
    Signed-off-by: Adrian Bunk

    Jan Engelhardt
     
  • define global BIT macro

    move all local BIT defines to the new globally define macro.

    Signed-off-by: Jiri Slaby
    Cc: Paul Mackerras
    Cc: Benjamin Herrenschmidt
    Cc: Kumar Gala
    Cc: Dmitry Torokhov
    Cc: Jeff Garzik
    Cc: James Bottomley
    Cc: "Antonino A. Daplas"
    Cc: Russell King
    Acked-by: Ralf Baechle
    Cc: "John W. Linville"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     
  • get rid of input BIT* duplicate defines

    use newly global defined macros for input layer. Also remove includes of
    input.h from non-input sources only for BIT macro definiton. Define the
    macro temporarily in local manner, all those local definitons will be
    removed further in this patchset (to not break bisecting).
    BIT macro will be globally defined (1<
    Cc:
    Acked-by: Jiri Kosina
    Cc:
    Acked-by: Marcel Holtmann
    Cc:
    Acked-by: Mauro Carvalho Chehab
    Cc:
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     
  • cpu_data is currently an array defined using NR_CPUS. This means that
    we overallocate since we will rarely really use maximum configured cpus.
    When NR_CPU count is raised to 4096 the size of cpu_data becomes
    3,145,728 bytes.

    These changes were adopted from the sparc64 (and ia64) code. An
    additional field was added to cpuinfo_x86 to be a non-ambiguous cpu
    index. This corresponds to the index into a cpumask_t as well as the
    per_cpu index. It's used in various places like show_cpuinfo().

    cpu_data is defined to be the boot_cpu_data structure for the NON-SMP
    case.

    Signed-off-by: Mike Travis
    Acked-by: Christoph Lameter
    Cc: Andi Kleen
    Cc: James Bottomley
    Cc: Dmitry Torokhov
    Cc: "Antonino A. Daplas"
    Cc: Mark M. Hoffman
    Signed-off-by: Andrew Morton
    Signed-off-by: Ingo Molnar
    Signed-off-by: Thomas Gleixner

    Mike Travis
     

19 Oct, 2007

1 commit

  • Introduce freezer-friendly wrappers around wait_event_interruptible() and
    wait_event_interruptible_timeout(), originally defined in , to
    be used in freezable kernel threads. Make some of the freezable kernel
    threads use them.

    This is necessary for the freezer to stop sending signals to kernel threads,
    which is implemented in the next patch.

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Pavel Machek
    Cc: Nigel Cunningham
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     

17 Oct, 2007

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
    kbuild: introduce ccflags-y, asflags-y and ldflags-y
    kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
    kbuild: enable use of AFLAGS and CFLAGS on commandline
    kbuild: enable 'make AFLAGS=...' to add additional options to AS
    kbuild: fix AFLAGS use in h8300 and m68knommu
    kbuild: check for wrong use of CFLAGS
    kbuild: enable 'make CFLAGS=...' to add additional options to CC
    kbuild: fix up CFLAGS usage
    kbuild: make modpost detect unterminated device id lists
    kbuild: call export_report from the Makefile
    kbuild: move Kai Germaschewski to CREDITS
    kconfig/menuconfig: distinguish between selected-by-another options and comments
    kconfig: tristate choices with mixed tristate and boolean values
    include/linux/Kbuild: remove duplicate entries
    kbuild: kill backward compatibility checks
    kbuild: kill EXTRA_ARFLAGS
    kbuild: fix documentation in makefiles.txt
    kbuild: call make once for all targets when O=.. is used
    kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
    kbuild: update _shipped files for kconfig syntax cleanup
    ...

    Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.

    Linus Torvalds
     

16 Oct, 2007

3 commits

  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
    [ARM] 4578/1: CM-x270: PCMCIA support
    [ARM] 4577/1: ITE 8152 PCI bridge support
    [ARM] 4576/1: CM-X270 machine support
    [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
    [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
    [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
    [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
    [ARM] pxa: PXA3xx base support
    [NET] smc91x: fix PXA DMA support code
    [SERIAL] Fix console initialisation ordering
    [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
    [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
    [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
    [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
    [ARM] Rename consistent_sync() as dma_cache_maint()
    [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
    [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
    [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
    [ARM] 4594/1: ns9xxx: use the new gpio functions
    [ARM] 4593/1: ns9xxx: implement generic clockevents
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
    Input: use full RCU API
    Input: remove tsdev interface
    Input: add support for Blackfin BF54x Keypad controller
    Input: appletouch - another fix for idle reset logic
    HWMON: hdaps - switch to using input-polldev
    Input: add support for SEGA Dreamcast keyboard
    Input: omap-keyboard - don't pretend we support changing keymap
    Input: lifebook - fix X and Y axis range
    Input: usbtouchscreen - add support for GeneralTouch devices
    Input: fix open count handling in input interfaces
    Input: keyboard - add CapsShift lock
    Input: adbhid - produce all CapsLock key events
    Input: ALPS - add signature for ThinkPad R61
    Input: jornada720_kbd - send MSC_SCAN events
    Input: add support for the HP Jornada 7xx (710/720/728) touchscreen
    Input: add support for HP Jornada 7xx onboard keyboard
    Input: add support for HP Jornada onboard keyboard (HP6XX)
    Input: ucb1400_ts - use schedule_timeout_uninterruptible
    Input: xpad - fix dependancy on LEDS class
    Input: auto-select INPUT for MAC_EMUMOUSEBTN option
    ...

    Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from
    a class device to a device and converting to use input-polldev created a
    few apparently trivial clashes..

    Linus Torvalds
     
  • Atari keyboard: incorporate additional review comments:
    o Kill reference to source file name
    o Return error value from input_register_device() instead of -ENOMEM

    Signed-off-by: Geert Uytterhoeven
    Cc: Dmitry Torokhov
    Cc: Michael Schmitz
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     

15 Oct, 2007

1 commit

  • * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (53 commits)
    hwmon: (vt8231) fix sparse warning
    hwmon: (sis5595) fix sparse warning
    hwmon: (w83627hf) don't assume bank 0
    hwmon: (w83627hf) Fix setting fan min right after driver load
    hwmon: (w83627hf) De-macro sysfs callback functions
    hwmon: Add new combined driver for FSC chips
    hwmon: (ibmpex) Release IPMI user if hwmon registration fails
    hwmon: (dme1737) Add sch311x support
    hwmon: (dme1737) group functions logically
    hwmon: (dme1737) cleanups
    hwmon: IBM power meter driver
    hwmon: (coretemp) Add support for Celeron 4xx
    hwmon: (lm87) Disable VID when it should be
    hwmon: (w83781d) Add individual alarm and beep files
    hwmon: VRM is not read from registers
    MAINTAINERS: update hwmon subsystem git trees
    hwmon: Fix the code examples in documentation
    hwmon: update sysfs interface document - error handling
    hwmon: (thmc50) Fix a debug message
    hwmon: (thmc50) Don't create temp3 if not enabled
    ...

    Linus Torvalds
     

14 Oct, 2007

2 commits

  • RT guys alerted me to the fact that in their tree spinlocks
    are preemptible and it is better to use full RCU API
    (rcu_read_lock()/rcu_read_unlock()) to be safe.

    Signed-off-by: Dmitry Torokhov

    Dmitry Torokhov
     
  • m68k: Atari input drivers cleanup:
    - memleak on failed init/register of input devices fixed
    - correct keycodes table (Atari keycodes are almost, but not entirely, equal
    to Linux keycodes).

    Signed-off-by: Michael Schmitz
    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     

13 Oct, 2007

6 commits