11 May, 2007

40 commits

  • Help people to work out how to use `gcc -W'.

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

    Andrew Morton
     
  • This got somehow lost in the noise. This fixes coverity bug id #1025, if
    Rup is greater or equal to MAX_RUP, we run past the Mapping Array.

    Signed-off-by: Eric Sesterhenn
    Cc: Jiri Slaby
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Eric Sesterhenn / Snakebyte
     
  • Add a call to hard_irq_disable() to stop_machine so that we make sure IRQs are
    really disabled and not only lazy-disabled on archs like powerpc as some users
    of stop_machine() may rely on that.

    [akpm@linux-foundation.org: build fix]
    Signed-off-by: Benjamin Herrenschmidt
    Acked-by: Rusty Russell
    Cc: Paul Mackerras
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Benjamin Herrenschmidt
     
  • Some architectures, like powerpc, implement lazy disabling of interrupts.
    That means that on those, local_irq_disable() doesn't actually disable
    interrupts on the CPU, but only sets some per CPU flag which cause them to be
    disabled only if an interrupt actually occurs.

    However, in some cases, such as stop_machine, we really want interrupts to be
    fully disabled. For example, I have code using stop machine to do ECC error
    injection, used to verify operations of the ECC hardware, that sort of thing.
    It really needs to make sure that nothing is actually writing to memory while
    the injection happens. Similar examples can be found in other low level bits
    and pieces.

    This patch implements a generic hard_irq_disable() function which is meant to
    be called -after- local_irq_disable() and ensures that interrupts are fully
    disabled on that CPU. The default implementation is a nop, though powerpc
    does already provide an appropriate one.

    Signed-off-by: Benjamin Herrenschmidt
    Cc: Rusty Russell
    Cc: Paul Mackerras
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Benjamin Herrenschmidt
     
  • This patch renames the raw hard_irq_{enable,disable} into
    __hard_irq_{enable,disable} and introduces a higher level hard_irq_disable()
    function that can be used by any code to enforce that IRQs are fully disabled,
    not only lazy disabled.

    The difference with the __ versions is that it will update some per-processor
    fields so that the kernel keeps track and properly re-enables them in the next
    local_irq_disable();

    This prepares powerpc for my next patch that introduces hard_irq_disable()
    generically.

    Signed-off-by: Benjamin Herrenschmidt
    Cc: Rusty Russell
    Cc: Paul Mackerras
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Benjamin Herrenschmidt
     
  • Add support for 32 bit ioctl on 64 bit systems for synclink_gt

    Cc: Arnd Bergmann
    Signed-off-by: Paul Fulghum
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul Fulghum
     
  • Remove unused argument in is_pmbr_valid()
    Remove unneeded initialization of local variable legacy_mbr

    Signed-off-by: Olaf Hering
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Olaf Hering
     
  • These files are almost all the same.

    This patch could be made even simpler if we don't mind POLLREMOVE turning
    up in a few architectures that didn't have it previously (which should be
    OK as POLLREMOVE is not used anywhere in the current tree).

    Signed-off-by: Stephen Rothwell
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Rothwell
     
  • Based on ace_dump_mem() from Grant Likely for the Xilinx SystemACE
    CompactFlash interface.

    Add print_hex_dump() & hex_dumper() to lib/hexdump.c and linux/kernel.h.

    This patch adds the functions print_hex_dump() & hex_dumper().
    print_hex_dump() can be used to perform a hex + ASCII dump of data to
    syslog, in an easily viewable format, thus providing a common text hex dump
    format.

    hex_dumper() provides a dump-to-memory function. It converts one "line" of
    output (16 bytes of input) at a time.

    Example usages:
    print_hex_dump(KERN_DEBUG, DUMP_PREFIX_ADDRESS, frame->data, frame->len);
    hex_dumper(frame->data, frame->len, linebuf, sizeof(linebuf));

    Example output using %DUMP_PREFIX_OFFSET:
    0009ab42: 40414243 44454647 48494a4b 4c4d4e4f-@ABCDEFG HIJKLMNO
    Example output using %DUMP_PREFIX_ADDRESS:
    ffffffff88089af0: 70717273 74757677 78797a7b 7c7d7e7f-pqrstuvw xyz{|}~.

    [akpm@linux-foundation.org: cleanups, add export]
    Signed-off-by: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • If CONFIG_TASK_IO_ACCOUNTING is defined, we update io accounting counters for
    each task.

    This patch permits reporting of values using the well known getrusage()
    syscall, filling ru_inblock and ru_oublock instead of null values.

    As TASK_IO_ACCOUNTING currently counts bytes counts, we approximate blocks
    count doing : nr_blocks = nr_bytes / 512

    Example of use :
    ----------------------
    After patch is applied, /usr/bin/time command can now give a good
    approximation of IO that the process had to do.

    $ /usr/bin/time grep tototo /usr/include/*
    Command exited with non-zero status 1
    0.00user 0.02system 0:02.11elapsed 1%CPU (0avgtext+0avgdata 0maxresident)k
    24288inputs+0outputs (0major+259minor)pagefaults 0swaps

    $ /usr/bin/time dd if=/dev/zero of=/tmp/testfile count=1000
    1000+0 enregistrements lus
    1000+0 enregistrements écrits
    512000 octets (512 kB) copiés, 0,00326601 seconde, 157 MB/s
    0.00user 0.00system 0:00.00elapsed 80%CPU (0avgtext+0avgdata 0maxresident)k
    0inputs+3000outputs (0major+299minor)pagefaults 0swaps

    Signed-off-by: Eric Dumazet
    Cc: Oleg Nesterov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Eric Dumazet
     
  • Make kernel stacks be 1 page on i386 and 2 pages on x86_64. These match the
    host values.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Add a separate IRQ stack. This differs from i386 in having the entire
    interrupt run on a separate stack rather than starting on the normal kernel
    stack and switching over once some preparation has been done. The underlying
    mechanism, is of course, sigaltstack.

    Another difference is that interrupts that happen in userspace are handled on
    the normal kernel stack. These cause a wait wakeup instead of a signal
    delivery so there is no point in trying to switch stacks for these. There's
    no other stuff on the stack, so there is no extra stack consumption.

    This quirk makes it possible to have the entire interrupt run on a separate
    stack - process preemption (and calls to schedule()) happens on a normal
    kernel stack. If we enable CONFIG_PREEMPT, this will need to be rethought.

    The IRQ stack for CPU 0 is declared in the same way as the initial kernel
    stack. IRQ stacks for other CPUs will be allocated dynamically.

    An extra field was added to the thread_info structure. When the active
    thread_info is copied to the IRQ stack, the real_thread field points back to
    the original stack. This makes it easy to tell where to copy the thread_info
    struct back to when the interrupt is finished. It also serves as a marker of
    a nested interrupt. It is NULL for the first interrupt on the stack, and
    non-NULL for any nested interrupts.

    Care is taken to behave correctly if a second interrupt comes in when the
    thread_info structure is being set up or taken down. I could just disable
    interrupts here, but I don't feel like giving up any of the performance gained
    by not flipping signals on and off.

    If an interrupt comes in during these critical periods, the handler can't run
    because it has no idea what shape the stack is in. So, it sets a bit for its
    signal in a global mask and returns. The outer handler will deal with this
    signal itself.

    Atomicity is had with xchg. A nested interrupt that needs to bail out will
    xchg its signal mask into pending_mask and repeat in case yet another
    interrupt hit at the same time, until the mask stabilizes.

    The outermost interrupt will set up the thread_info and xchg a zero into
    pending_mask when it is done. At this point, nested interrupts will look at
    ->real_thread and see that no setup needs to be done. They can just continue
    normally.

    Similar care needs to be taken when exiting the outer handler. If another
    interrupt comes in while it is copying the thread_info, it will drop a bit
    into pending_mask. The outer handler will check this and if it is non-zero,
    will loop, set up the stack again, and handle the interrupt.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Some tidying of the irq code before introducing irq stacks. Mostly
    style fixes, but the timer handler calls the timer code directly
    rather than going through the generic sig_handler_common_skas.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Now that we have UM_THREAD_SIZE, we can replace the calculations in
    user-space code (an earlier patch took care of the kernel side of the
    house).

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Replaced task_protections with stack_protections since they do the same
    thing, and task_protections was misnamed anyway.

    This needs THREAD_SIZE, so that's imported via common-offsets.h

    Also tidied up the code in the vicinity.

    Signed-off-by: Jeff Dike
    Cc: Paolo 'Blaisorblade' Giarrusso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Dike
     
  • Don't enable SYSV68 partition table support on all m68k boxes by default,
    only on Motorola VME boards.

    Signed-off-by: Geert Uytterhoeven
    Cc: Philippe De Muyter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • This patch is required to handle file-mapped or swapped-out pages
    correctly.

    - Fix pte_to_pgoff() and pgoff_to_pte() macros not to include
    _PAGE_PROTNONE bit of PTE.
    Mask value for { ACCESSED, N, (R, W, X), L, G } is not 0xef but 0x7f.
    - Fix __swp_type() macro for MAX_SWAPFILES_SHIFT(=5), which is defined
    in include/linux/swap.h.

    * M32R TLB format

    [0] [1:19] [20:23] [24:31]
    +-----------------------+----+-------------+
    | VPN |0000| ASID |
    +-----------------------+----+-------------+
    +-+---------------------+----+-+---+-+-+-+-+
    |0 PPN |0000|N|AC |L|G|V| |
    +-+---------------------+----+-+---+-+-+-+-+
    || RWX | |
    * software bits in PTE || | +-- _PAGE_FILE | _PAGE_DIRTY
    || +---- _PAGE_PRESENT
    |+---------------- _PAGE_ACCESSED
    +----------------- _PAGE_PROTNONE

    Signed-off-by: Hitoshi Yamamoto
    Signed-off-by: Hirokazu Takata
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hirokazu Takata
     
  • Fix the tlb-miss handler (tme_handler) to check _PAGE_PRESENT bit
    in order to handle file-mapped or swapped-out pages correctly.

    This patch is required to fix unexpected page errors for m32r.

    Signed-off-by: Hitoshi Yamamoto
    Signed-off-by: Hirokazu Takata
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hirokazu Takata
     
  • This patch fixes a rarely-happened but severe scheduling problem of
    the recent m32r kernel of 2.6.17-rc3 or later.

    In the following previous m32r patch, the switch_to macro was
    modified not to do unnecessary push/pop operations for tuning.
    > [PATCH] m32r: update switch_to macro for tuning
    > 4127272c38619c56f0c1aa01d01c7bd757db70a1

    In this modification, only 'lr' and 'sp' registers are push/pop'ed,
    assuming that the m32r kernel is always compiled with
    -fomit-frame-pointer option.

    However, in 2.6 kernel, kernel/sched.c is irregularly compiled
    with -fno-omit-frame-pointer if CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER
    is not defined.

    -- kernel/Makefile --
    :
    ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y)
    # According to Alan Modra , the -fno-omit-frame-pointer is
    # needed for x86 only. Why this used to be enabled for all architectures is beyond
    # me. I suspect most platforms don't need this, but until we know that for sure
    # I turn this off for IA-64 only. Andreas Schwab says it's also needed on m68k
    # to get a correct value for the wait-channel (WCHAN in ps). --davidm
    CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
    endif
    :
    ---

    Therefore, for the recent m32r kernel, we have to push/pop 'fp'
    (frame pointer) if CONFIG_FRAME_POINTER is defined or
    CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER is not defined.

    Signed-off-by: Hitoshi Yamamoto
    Signed-off-by: Hirokazu Takata
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hirokazu Takata
     
  • h8300 systemcall entry table update.

    Signed-off-by: Yoshinori Sato
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Yoshinori Sato
     
  • Replace function instances of __attribute__((unused)) with
    __maybe_unused to suppress warnings.

    Cc: David Howells
    Signed-off-by: David Rientjes
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Rientjes
     
  • VM statistics updates do not matter if the kernel is in idle powersaving
    mode. So allow the timer to be deferred.

    It would be better though if we could switch the timer between deferrable
    and nondeferrable based on differentials present. The timer would start
    out nondeferrable and if we find that there were no updates in the last
    statistics interval then we would switch the timer to deferrable. If the
    timer later finds again that there are differentials then go to
    nondeferrable again.

    And yet another way would be to run the timer shortly before going to idle?

    The solution here means that the VM counters may be slightly off during
    idle since differentials may be still pending while the timer is deferred.

    Signed-off-by: Christoph Lameter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Lameter
     
  • Implement the statfs() op for AFS.

    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     
  • Fix a couple of problems with unlinking AFS files.

    (1) The parent directory wasn't being updated properly between unlink() and
    the following lookup().

    It seems that, for some reason, invalidate_remote_inode() wasn't
    discarding the directory contents correctly, so this patch calls
    invalidate_inode_pages2() instead on non-regular files.

    (2) afs_vnode_deleted_remotely() should handle vnodes that don't have a
    source server recorded without oopsing.

    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     
  • Following bug was uncovered by compiling with '-W' flag:

    CC [M] fs/afs/write.o
    fs/afs/write.c: In function ‘afs_write_back_from_locked_page’:
    fs/afs/write.c:398: warning: comparison of unsigned expression >= 0 is always true

    Loop variable 'n' is unsigned, so wraps around happily as far as I can
    see. Trival fix attached (compile tested only).

    Signed-off-by: Mika Kukkonen
    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     
  • Add epoll_pwait()

    (akpm: stolen from Andi's queue, because I want to send the signalfd patches
    which also add syscalls. Not sure what the __IGNORE_getcpu is for).

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

    Andi Kleen
     
  • Documentation/gpio.txt should mention the Kconfig GENERIC_GPIO flag, for
    platforms to declare when relevant. This should help minimize goofs like
    omitting it, or not depending on it when needed.

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

    David Brownell
     
  • Following bug was uncovered by compiling with '-W' flag:

    CC mm/thrash.o
    mm/thrash.c: In function ‘grab_swap_token’:
    mm/thrash.c:52: warning: comparison of unsigned expression < 0 is always false

    Variable token_priority is unsigned, so decrementing first and then
    checking the result does not work; fixed by reversing the test, patch
    attached (compile tested only).

    I am not sure if likely() makes much sense in this new situation, but
    I'll let somebody else to make a decision on that.

    Signed-off-by: Mika Kukkonen
    Cc: Rik van Riel
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mika Kukkonen
     
  • o x86_64 kernel needs to be compiled for 2MB aligned addresses. Currently
    we are using BUILD_BUG_ON() to warn the user if he has not done so. But
    looks like folks are not finding message very intutive and don't open
    the respective c file to find problem source. (Bug 8439)

    arch/x86_64/kernel/head64.c: In function 'x86_64_start_kernel':
    arch/x86_64/kernel/head64.c:70: error: size of array 'type name' is negative

    o Using preprocessor directive #error to print a better message if
    CONFIG_PHYSICAL_START is not aligned to 2MB boundary.

    Signed-off-by: Vivek Goyal
    Cc: Andi Kleen
    Cc: "Eric W. Biederman"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Vivek Goyal
     
  • A recent change makes my Dell 1501 hang on boot. It's an AMD MK-36. I use
    an x86_64 kernel. It is 100% reproducible.

    I debugged this problem a bit and my compiler[1]interprets the =A constraint
    as %rax instead of %edx:%eax on x86_64 which causes the problem. The appended
    patch provides a workaround for this and fixed the hang on my machine.

    [1] gcc version 4.1.3 20070429 (prerelease) (Debian 4.1.2-5)

    Signed-off-by: Joerg Roedel
    Cc: Andi Kleen
    Cc: Benny Halevy
    Cc: Pete Zaitcev
    Cc: "Joerg Roedel"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joerg Roedel
     
  • In 9d6a8c5c213e34c475e72b245a8eb709258e968c we changed posix_test_lock
    to modify its single file_lock argument instead of taking separate input
    and output arguments. This makes it no longer safe to set the output
    lock's fl_type to F_UNLCK before looking for a conflict, since that
    means searching for a conflict against a lock with type F_UNLCK.

    This fixes a regression which causes F_GETLK to incorrectly report no
    conflict on most filesystems (including any filesystem that doesn't do
    its own locking).

    Also fix posix_lock_to_flock() to copy the lock type. This isn't
    strictly necessary, since the caller already does this; but it seems
    less likely to cause confusion in the future.

    Thanks to Doug Chapman for the bug report.

    Signed-off-by: "J. Bruce Fields"
    Acked-by: Doug Chapman
    Signed-off-by: Linus Torvalds

    J. Bruce Fields
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
    [WATCHDOG] MTX-1 Watchdog driver
    [WATCHDOG] s3c2410_wdt - initialize watchdog irq resource
    [WATCHDOG] Kconfig menuconfig patch
    [WATCHDOG] pcwd.c: Port to the new device driver model
    [WATCHDOG] use mutex instead of semaphore in Berkshire USB-PC Watchdog driver
    [WATCHDOG] the scheduled removal of the i8xx_tco watchdog driver
    [WATCHDOG] Semi-typical watchdog bug re early misc_register()
    [WATCHDOG] add support for the w83627thf chipset.

    Linus Torvalds
     
  • A small regression appears to have been introduced in the recent patch
    "cleanup compat ioctl handling", which was included in Linus' tree after
    2.6.20.

    siocdevprivate_ioctl() is no longer defined if CONFIG_NET is undefined,
    whereas previously it was a dummy function in this case.

    This causes compilation with CONFIG_COMPAT but without CONFIG_NET to fail.

    fs/compat_ioctl.c: In function `compat_sys_ioctl':
    fs/compat_ioctl.c:3571: warning: implicit declaration of function `siocdevprivate_ioctl'

    Cc: Christoph Hellwig
    Acked-by: Arnd Bergmann
    Cc: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Simon Horman
     
  • drivers/input/misc/ixp4xx-beeper.c: In function 'ixp4xx_spkr_event':
    drivers/input/misc/ixp4xx-beeper.c:54: error: 'input_dev' undeclared (first use in this function)
    drivers/input/misc/ixp4xx-beeper.c:54: error: (Each undeclared identifier is reported only once
    drivers/input/misc/ixp4xx-beeper.c:54: error: for each function it appears in.)

    Signed-off-by: Frederik Deweerdt
    Acked-by: Dmitry Torokhov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Frederik Deweerdt
     
  • * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (24 commits)
    [POWERPC] Fix compile error with kexec and CONFIG_SMP=n
    [POWERPC] Split initrd logic out of early_init_dt_scan_chosen() to fix warning
    [POWERPC] Fix warning in hpte_decode(), and generalize it
    [POWERPC] Minor pSeries IOMMU debug cleanup
    [POWERPC] PS3: Fix sys manager build error
    [POWERPC] Assorted janitorial EEH cleanups
    [POWERPC] We don't define CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
    [POWERPC] pmu_sys_suspended is only defined for PPC32
    [POWERPC] Fix incorrect calculation of I/O window addresses
    [POWERPC] celleb: Update celleb_defconfig
    [POWERPC] celleb: Fix parsing of machine type hack command line option
    [POWERPC] celleb: Fix PCI config space accesses to subordinate buses
    [POWERPC] celleb: Fix support for multiple PCI domains
    [POWERPC] Wire up sys_utimensat
    [POWERPC] CPM_UART: Removed __init from cpm_uart_init_portdesc to fix warning
    [POWERPC] User rheap from arch/powerpc/lib
    [POWERPC] 83xx: Fix the PCI ranges in the MPC834x_MDS device tree.
    [POWERPC] 83xx: Fix the PCI ranges in the MPC832x_MDS device tree.
    [POWERPC] CPM_UART: cpm_uart_set_termios should take ktermios, not termios
    [POWERPC] Change rheap functions to use ulongs instead of pointers
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
    [SPARC64]: Use alloc_pci_dev() in PCI bus probes.
    [SPARC64]: Bump PROMINTR_MAX to 32.
    [SPARC64]: Fix recursion in PROM tree building.
    [SERIAL] sunzilog: Interrupt enable before ISR handler installed
    [SPARC64] PCI: Consolidate PCI access code into pci_common.c

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
    acpi,msi-laptop: Fall back to EC polling mode for MSI laptop specific EC commands
    sony-laptop: rename SONY_LAPTOP_OLD to a more meaningful SONYPI_COMPAT
    asus-laptop: version bump and lindent
    asus-laptop: fix light sens init
    asus-laptop: add GPS support
    asus-laptop: notify ALL events
    ACPICA: Lindent
    ACPI: created a dedicated workqueue for notify() execution
    Revert "ACPICA: fix AML mutex re-entrancy"
    Revert "Execute AML Notify() requests on stack."
    Revert "ACPICA: revert "acpi_serialize" changes"
    ACPI: delete un-reliable concept of cooling mode
    ACPI: thermal trip points are read-only

    Linus Torvalds
     
  • * 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (138 commits)
    firewire: Convert OHCI driver to use standard goto unwinding for error handling.
    firewire: Always use parens with sizeof.
    firewire: Drop single buffer request support.
    firewire: Add a comment to describe why we split the sg list.
    firewire: Return SCSI_MLQUEUE_HOST_BUSY for out of memory cases in queuecommand.
    firewire: Handle the last few DMA mapping error cases.
    firewire: Allocate scsi_host up front and allocate the sbp2_device as hostdata.
    firewire: Provide module aliase for backwards compatibility.
    firewire: Add to fw-core-y instead of assigning fw-core-objs in Makefile.
    firewire: Break out shared IEEE1394 constant to separate header file.
    firewire: Use linux/*.h instead of asm/*.h header files.
    firewire: Uppercase most macro names.
    firewire: Coding style cleanup: no spaces after function names.
    firewire: Convert card_rwsem to a regular mutex.
    firewire: Clean up comment style.
    firewire: Use lib/ implementation of CRC ITU-T.
    CRC ITU-T V.41
    firewire: Rename fw-device-cdev.c to fw-cdev.c and move header to include/linux.
    firewire: Future proof the iso ioctls by adding a handle for the iso context.
    firewire: Add read/write and size annotations to IOC numbers.
    ...

    Acked-by: Christoph Hellwig
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
    [S390] update default configuration.
    [S390] Kconfig: no wireless on s390.
    [S390] Kconfig: use common Kconfig files for s390.
    [S390] Kconfig: common config options for s390.
    [S390] Kconfig: unwanted menus for s390.
    [S390] Kconfig: menus with depends on HAS_IOMEM.
    [S390] Kconfig: refine depends statements.
    [S390] Avoid compile warning.
    [S390] qdio: re-add lost perf_stats.tl_runs change in qdio_handle_pci
    [S390] Avoid sparse warnings.
    [S390] dasd: Fix modular build.
    [S390] monreader inlining cleanup.
    [S390] cio: Make some structures and a function static.
    [S390] cio: Get rid of _ccw_device_get_device_number().
    [S390] fix subsystem removal fallout

    Linus Torvalds
     
  • On 09-05-2007 21:10, Pallipadi, Venkatesh wrote:
    ...
    > On a 64 bit system, converting pointer to int causes unnecessary
    > compiler warning, and intermediate long conversion was to avoid that.
    > I will have to rephrase my comment to remove 32 bit value and use int,
    > as that is what the function returns.

    So, this patch reverts all changes done by my previous patch.

    I apologize for my wrong comment about "logical error" here.

    Cc: "Pallipadi, Venkatesh"
    Cc: Satyam Sharma
    Cc: Oleg Nesterov
    Signed-off-by: Jarek Poplawski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    akpm@linux-foundation.org