26 Jul, 2008

4 commits

  • * git://git.infradead.org/~dwmw2/random-2.6:
    remove dummy asm/kvm.h files
    firmware: create firmware binaries during 'make modules'.

    Linus Torvalds
     
  • This means that we no longer need write access to the source tree while
    doing 'make modules_install'.

    Signed-off-by: David Woodhouse

    David Woodhouse
     
  • uname -m was leaving a newline in $arch, and not passing the tests.

    Also, printing the unknown arch on failure is probably helpful.

    Signed-off-by: Eric Sandeen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Eric Sandeen
     
  • Currently, checkstack.pl only looks for fixed subtractions from the stack
    pointer. However, things like this:

    void function(int size)
    {
    char stackbuster[size << 2];
    ...

    are certainly worth pointing out, I think.

    This could perhaps be done more cleanly, and the following patch only
    adds "dynamic" REs for x86 and x86_64, but it works:

    0x00b0 crypto_cbc_decrypt_inplace [cbc]: Dynamic (%rax)
    0x00ad crypto_pcbc_decrypt_inplace [pcbc]: Dynamic (%rax)
    0x02f6 crypto_pcbc_encrypt_inplace [pcbc]: Dynamic (%rax)
    0x036c _crypto_xcbc_digest_setkey [xcbc]: Dynamic (%rax)
    ...

    (Inspired by Keith Owens' old stack-check script)

    Signed-off-by: Eric Sandeen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Eric Sandeen
     

25 Jul, 2008

29 commits


23 Jul, 2008

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (79 commits)
    arm: bus_id -> dev_name() and dev_set_name() conversions
    sparc64: fix up bus_id changes in sparc core code
    3c59x: handle pci_name() being const
    MTD: handle pci_name() being const
    HP iLO driver
    sysdev: Convert the x86 mce tolerant sysdev attribute to generic attribute
    sysdev: Add utility functions for simple int/ulong variable sysdev attributes
    sysdev: Pass the attribute to the low level sysdev show/store function
    driver core: Suppress sysfs warnings for device_rename().
    kobject: Transmit return value of call_usermodehelper() to caller
    sysfs-rules.txt: reword API stability statement
    debugfs: Implement debugfs_remove_recursive()
    HOWTO: change email addresses of James in HOWTO
    always enable FW_LOADER unless EMBEDDED=y
    uio-howto.tmpl: use unique output names
    uio-howto.tmpl: use standard copyright/legal markings
    sysfs: don't call notify_change
    sysdev: fix debugging statements in registration code.
    kobject: should use kobject_put() in kset-example
    kobject: reorder kobject to save space on 64 bit builds
    ...

    Linus Torvalds
     
  • When a kernel was rebuilt, the previous Module.markers was not cleared.
    It caused markers with different format strings to appear as duplicates
    when a markers was changed. This problem is present since
    scripts/mod/modpost.c started to generate Module.markers, commit
    b2e3e658b344c6bcfb8fb694100ab2f2b5b2edb0

    It therefore applies to 2.6.25, 2.6.26 and linux-next.

    I merely merged the patches from Roland, Wenji and Takashi here.

    Credits to
    Roland McGrath
    Wenji Huang
    and
    Takashi Nishiie

    for providing the individual fixes.

    - Changelog :
    - Integrated Takashi's Makefile modification to clear Module.markers upon
    make clean.

    Signed-off-by: Mathieu Desnoyers
    Cc: Roland McGrath
    Cc: Wenji Huang
    Cc: Takashi Nishiie
    Cc: [2.6.25.x, 2.6.26.x]
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mathieu Desnoyers
     

22 Jul, 2008

1 commit

  • Along with the non-modalias conformant "pnp:*" aliases, we add "acpi:*"
    entries to PNP drivers, to allow module autoloading by ACPI PNP device
    entries, which export proper modalias information, without any specific
    userspace modprobe mangling.

    Cc: Adam Belay
    Cc: Thomas Renninger
    Signed-off-by: Kay Sievers
    Signed-off-by: Greg Kroah-Hartman

    Kay Sievers
     

18 Jul, 2008

1 commit


15 Jul, 2008

3 commits

  • * 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
    firmware: convert sb16_csp driver to use firmware loader exclusively
    dsp56k: use request_firmware
    edgeport-ti: use request_firmware()
    edgeport: use request_firmware()
    vicam: use request_firmware()
    dabusb: use request_firmware()
    cpia2: use request_firmware()
    ip2: use request_firmware()
    firmware: convert Ambassador ATM driver to request_firmware()
    whiteheat: use request_firmware()
    ti_usb_3410_5052: use request_firmware()
    emi62: use request_firmware()
    emi26: use request_firmware()
    keyspan_pda: use request_firmware()
    keyspan: use request_firmware()
    ttusb-budget: use request_firmware()
    kaweth: use request_firmware()
    smctr: use request_firmware()
    firmware: convert ymfpci driver to use firmware loader exclusively
    firmware: convert maestro3 driver to use firmware loader exclusively
    ...

    Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
    drivers/char/ip2/ip2main.c manually.

    Linus Torvalds
     
  • Conflicts:

    sound/pci/Kconfig

    David Woodhouse
     
  • * 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (228 commits)
    ftrace: build fix for ftraced_suspend
    ftrace: separate out the function enabled variable
    ftrace: add ftrace_kill_atomic
    ftrace: use current CPU for function startup
    ftrace: start wakeup tracing after setting function tracer
    ftrace: check proper config for preempt type
    ftrace: trace schedule
    ftrace: define function trace nop
    ftrace: move sched_switch enable after markers
    ftrace: prevent ftrace modifications while being kprobe'd, v2
    fix "ftrace: store mcount address in rec->ip"
    mmiotrace broken in linux-next (8-bit writes only)
    ftrace: avoid modifying kprobe'd records
    ftrace: freeze kprobe'd records
    kprobes: enable clean usage of get_kprobe
    ftrace: store mcount address in rec->ip
    ftrace: build fix with gcc 4.3
    namespacecheck: fixes
    ftrace: fix "notrace" filtering priority
    ftrace: fix printout
    ...

    Linus Torvalds