23 Feb, 2009

1 commit

  • http://kisskb.ellerman.id.au/kisskb/buildresult/72115/:
    | net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile'
    | net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token
    | net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type
    | distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed

    This is caused by

    | # define mfp ((*(volatile struct MFP*)MFP_BAS))

    in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in
    net/mac80211/ieee80211_i.h.

    Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define.

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

    Geert Uytterhoeven
     

21 Feb, 2009

2 commits


12 Feb, 2009

1 commit


06 Feb, 2009

1 commit


04 Feb, 2009

1 commit

  • * master.kernel.org:/home/rmk/linux-2.6-arm:
    NVRAM depends on RTC_DRV_CMOS
    rename platform_driver name "flash" to "sa1100-mtd"
    annotate that [fp, #-4] is the saved lr
    Use __SPIN_LOCK_UNLOCKED to initialize bad_irq_desc.lock
    ARM: OMAP: fix fault in enter_full_retention()
    ARM: OMAP: Mask interrupts when disabling interrupts, v2
    ARM: OMAP: gptimer min_delta_ns corrected
    ARM: OMAP: Fix hsmmc init, v2
    ARM: OMAP: Fix omap34xx revision detection for ES3.1
    ARM: OMAP: DMA: Fix uninitialized channel flags
    ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling
    ARM: OMAP: Fix McBSP spin_lock deadlock
    [ARM] 5366/1: fix shared memory coherency with VIVT L1 + L2 caches
    [ARM] call undefined instruction exception handler with irqs enabled
    [ARM] msm: fix build errors
    [ARM] etherh: continue fixing build failure

    Linus Torvalds
     

01 Feb, 2009

1 commit

  • Fix an off-by-two memory error in console selection.

    The loop below goes from sel_start to sel_end (inclusive), so it writes
    one more character. This one more character was added to the allocated
    size (+1), but it was not multiplied by an UTF-8 multiplier.

    This patch fixes a memory corruption when UTF-8 console is used and the
    user selects a few characters, all of them 3-byte in UTF-8 (for example
    a frame line).

    When memory redzones are enabled, a redzone corruption is reported.
    When they are not enabled, trashing of random memory occurs.

    Signed-off-by: Mikulas Patocka
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     

31 Jan, 2009

1 commit


27 Jan, 2009

2 commits

  • __tty_open could return (to userspace) holding the tty_mutex thanks to a
    regression introduced by 4a2b5fddd53b80efcb3266ee36e23b8de28e761a ("Move
    tty lookup/reopen to caller").

    This was found by bisecting an fsfuzzer problem. Admittedly I have no
    idea how it managed to tickle this 100% reliably, but it is clearly a
    regression and when hit leaves the box in a completely unusable state.
    This patch lets the fsfuzzer test complete every time.

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

    Eric Paris
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
    [ARM] fix section-based ioremap
    [NET] am79c961a: fix spin_lock usage
    [ARM] omap: usb: thou shalt not provide empty release functions
    [ARM] omap: watchdog: allow OMAP watchdog driver on OMAP34xx platforms
    [ARM] 5369/1: omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
    [ARM] clkdev: fix clock matching
    [ARM] 5370/1: at91: fix rm9200 watchdog
    [ARM] 5368/1: arch/arm/mach-davinci/usb.c buildfix
    [ARM] 5365/1: s3cmci: Use new include path of dma.h
    [ARM] fix StrongARM-11x0 page copy implementation
    [ARM] omap: ensure OMAP drivers pass a struct device to clk_get()
    ARM: OMAP: Fix compile for h3 MMC
    ARM: OMAP: Remove unused platform devices, v3
    ARM: OMAP: Fix ASoC by enabling writes to XCCR and RCCR McBSP registers, v3
    ARM: OMAP: Fix OSK ASoC by registering I2C board info for tlvaic23
    ARM: OMAP: remove duplicated #include's
    ARM: OMAP: Fix DMA CCR programming for request line > 63, v3
    ARM: OMAP: Fix gpio.c compile on 15xx with CONFIG_DEBUGFS
    ARM: OMAP: Fix compile for beagle
    ARM: OMAP: Fix gpio by switching to generic gpio calls, v2
    ...

    Linus Torvalds
     

24 Jan, 2009

1 commit


16 Jan, 2009

5 commits

  • This patch removes the tty->low_latency setting.

    For irq based hvc_console backends the tty->low_latency must be set to 0,
    because the tty_flip_buffer_push() function must not be called from IRQ context
    (see drivers/char/tty_buffer.c).

    For polled backends, the low_latency setting causes the bug trace below, because
    tty_flip_buffer_push() is called within an atomic context and subsequent calls
    might sleep due to mutex_lock.

    BUG: sleeping function called from invalid context at /root/cvs/linux-2.6.git/kernel/mutex.c:207
    in_atomic(): 1, irqs_disabled(): 0, pid: 748, name: khvcd
    1 lock held by khvcd/748:
    #0: (hvc_structs_lock){--..}, at: [] khvcd+0x58/0x12c
    CPU: 0 Not tainted 2.6.29-rc1git #29
    Process khvcd (pid: 748, task: 000000002fb9a480, ksp: 000000002f66bd78)
    070000000000000a 000000002f66ba00 0000000000000002 (null)
    000000002f66baa0 000000002f66ba18 000000002f66ba18 0000000000104f08
    ffffffffffffc000 000000002f66bd78 (null) (null)
    000000002f66ba00 000000000000000c 000000002f66ba00 000000002f66ba70
    0000000000466af8 0000000000104f08 000000002f66ba00 000000002f66ba50
    Call Trace:
    ([] show_trace+0x138/0x158)
    [] show_stack+0xc6/0xf8
    [] dump_stack+0xb0/0xc0
    [] __might_sleep+0x14e/0x17c
    [] mutex_lock_nested+0x42/0x3b4
    [] echo_char_raw+0x3a/0x9c
    [] n_tty_receive_buf+0x1154/0x1208
    [] flush_to_ldisc+0x152/0x220
    [] tty_flip_buffer_push+0x6a/0x90
    [] hvc_poll+0x244/0x2c8
    [] khvcd+0x70/0x12c
    [] kthread+0x68/0xa0
    [] kernel_thread_starter+0x6/0xc
    [] kernel_thread_starter+0x0/0xc
    1 lock held by khvcd/748:
    #0: (hvc_structs_lock){--..}, at: [] khvcd+0x58/0x12c

    Signed-off-by: Hendrik Brueckner
    Acked-by: Christian Borntraeger
    Signed-off-by: Benjamin Herrenschmidt

    Hendrik Brueckner
     
  • Also a couple of min -> min_t changes.

    Signed-off-by: Stephen Rothwell
    Acked-by: Geoff Levand
    Signed-off-by: Benjamin Herrenschmidt

    Stephen Rothwell
     
  • - Enable ring indicator interrupt.

    - Remove vendor specific CVS version tags.

    Signed-off-by: Paul Fulghum
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul Fulghum
     
  • Add an explanitory comment as to why we modify the kernel console loglevel
    rather than simply moving sysrq messages to KERN_EMERG level.

    Signed-off-by: Andy Whitcroft
    Cc: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andy Whitcroft
     
  • If you issue an ioctl to flush a tty as the line discipline is changing or
    otherwise unplugged you can get a crash. The bug is very old but the rest
    of the BKL lock dropping and some very "good" luck on Ingo's part caught
    an example.

    Use the correct ldisc_ref form so that we wait for the ldisc change to
    complete and then flush

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

    Alan Cox
     

13 Jan, 2009

9 commits


10 Jan, 2009

1 commit

  • * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
    [S390] update documentation for hvc_iucv kernel parameter.
    [S390] hvc_iucv: Special handling of IUCV HVC devices
    [S390] hvc_iucv: Refactor console and device initialization
    [S390] hvc_iucv: Update function documentation
    [S390] hvc_iucv: Limit rate of outgoing IUCV messages
    [S390] hvc_iucv: Change IUCV term id and use one device as default
    [S390] Use unsigned long long for u64 on 64bit.
    [S390] qdio: fix broken pointer in case of CONFIG_DEBUG_FS is disabled
    [S390] vdso: compile fix
    [S390] remove code for oldselect system call
    [S390] types: add/fix types.h include in header files
    [S390] dasd: add device attribute to disable blocking on lost paths
    [S390] dasd: send change uevents for dasd block devices
    [S390] tape block: fix dependencies
    [S390] asm-s390/posix_types.h: drop __USE_ALL usage
    [S390] gettimeofday.S: removed duplicated #includes
    [S390] ptrace: no extern declarations for userspace

    Linus Torvalds
     

09 Jan, 2009

11 commits


08 Jan, 2009

3 commits