1. 07 Oct, 2006 1 commit
    • Olof Johansson's avatar
      [POWERPC] Fix fsl_soc build breaks · 2b00b254
      Olof Johansson authored
      Hrm, there's no way this ever built at time of merge. There's a missing } and
      the wrong type on phy_irq.
      
      Also, another const for get_property().
      
        CC      arch/powerpc/sysdev/fsl_soc.o
      arch/powerpc/sysdev/fsl_soc.c: In function 'fs_enet_of_init':
      arch/powerpc/sysdev/fsl_soc.c:625: error: assignment of read-only variable 'phy_irq'
      arch/powerpc/sysdev/fsl_soc.c:625: warning: assignment makes integer from pointer without a cast
      arch/powerpc/sysdev/fsl_soc.c:661: warning: assignment discards qualifiers from pointer target type
      arch/powerpc/sysdev/fsl_soc.c:684: error: subscripted value is neither array nor pointer
      arch/powerpc/sysdev/fsl_soc.c:687: error: subscripted value is neither array nor pointer
      arch/powerpc/sysdev/fsl_soc.c:722: warning: ISO C90 forbids mixed declarations and code
      arch/powerpc/sysdev/fsl_soc.c:728: error: invalid storage class for function 'cpm_uart_of_init'
      arch/powerpc/sysdev/fsl_soc.c:798: error: initializer element is not constant
      arch/powerpc/sysdev/fsl_soc.c:798: error: expected declaration or statement at end of input
      make[1]: *** [arch/powerpc/sysdev/fsl_soc.o] Error 1
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      2b00b254
  2. 06 Oct, 2006 10 commits
  3. 05 Oct, 2006 29 commits
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/~dhowells/irq-2.6 · 44aefd27
      Linus Torvalds authored
      * git://git.infradead.org/~dhowells/irq-2.6:
        IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
        IRQ: Typedef the IRQ handler function type
        IRQ: Typedef the IRQ flow handler function type
      44aefd27
    • Peter Osterlund's avatar
      [PATCH] UDF: Fix mounting read-write · c1a26e7d
      Peter Osterlund authored
      The UDF filesystem can't be mounted in read-write mode any more,
      because of forgotten braces.
      Signed-off-by: default avatarPeter Osterlund <petero2@telia.com>
      [ Duh! ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      c1a26e7d
    • Randy Dunlap's avatar
      [PATCH] x86-64: Fix compilation without CONFIG_KALLSYMS · 4b0ff1a9
      Randy Dunlap authored
      Include linux/kallsyms.h unconditionally for print_symbol().
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      4b0ff1a9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 · e03508b4
      Linus Torvalds authored
      * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
        [PATCH] i386: fix rwsem build bug on CONFIG_M386=y
        [PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers
        [PATCH] x86-64: Fix FPU corruption
        [PATCH] x86: Terminate the kernel stacks for the unwinder
        [PATCH] i386: Fix PCI BIOS config space access
        [PATCH] x86-64: Calgary IOMMU: print PCI bus numbers in hex
        [PATCH] x86-64: Calgary IOMMU: Update Jon's contact info
        [PATCH] x86-64: Calgary IOMMU: Fix off by one when calculating register space location
        [PATCH] x86-64: Calgary IOMMU: deobfuscate calgary_init
        [PATCH] i386: Update defconfig
        [PATCH] x86-64: Update defconfig
      
      [ Manually skipped commits that incorrectly ignored AC in kernel space.
        The alignment fault is defined to only happen for CPL3 anyway  - Linus ]
      e03508b4
    • Frederik Deweerdt's avatar
      [PATCH] fix qla{2,4} build error · d7a297ba
      Frederik Deweerdt authored
      commit 0181944f adds a
      'extended_error_logging' global variable to qla2xxx which is defined by
      qla4xxx too.
      
      Trying to build both drivers results in the following error:
      
        LD      drivers/scsi/built-in.o
        drivers/scsi/qla4xxx/built-in.o: In function `qla4xxx_slave_configure':
        drivers/scsi/qla4xxx/ql4_os.c:1433: multiple definition of `extended_error_logging'
        drivers/scsi/qla2xxx/built-in.o:drivers/scsi/qla2xxx/qla_os.c:2166:
        first defined here
        make[2]: *** [drivers/scsi/built-in.o] Error 1
        make[1]: *** [drivers/scsi] Error 2
        make: *** [drivers] Error 2
      
      The following patch simply adds a qla2_ (qla4_ respectively) prefix to
      the variable name.
      Signed-off-by: default avatarFrederik Deweerdt <frederik.deweerdt@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      d7a297ba
    • Ingo Molnar's avatar
      [PATCH] i386: fix rwsem build bug on CONFIG_M386=y · 88271e9e
      Ingo Molnar authored
      CONFIG_M386 turns on spinlock-based generic rwsems - which surprises the
      semaphore.S rwsem stubs. Tested both with and without CONFIG_M386.
      Reported-by: default avatarKlaus Knopper <knopper@knopper.net>
      Triaged-by: default avatarAdrian Bunk <bunk@stusta.de>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      88271e9e
    • Andi Kleen's avatar
      [PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers · 7d0b0e8d
      Andi Kleen authored
      Add correct CFI annotation to the backlink on top of the interrupt stack.
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      7d0b0e8d
    • Andi Kleen's avatar
      [PATCH] x86-64: Fix FPU corruption · 0a5ace2a
      Andi Kleen authored
      This reverts an earlier patch that was found to cause FPU
      state corruption. I think the corruption happens because
      unlazy_fpu() can cause FPU exceptions and when it happens
      after the current switch some processing would affect
      the state in the wrong process.
      
      Thanks to  Douglas Crosher and Tom Hughes for testing.
      
      Cc: jbeulich@novell.com
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      0a5ace2a
    • Andi Kleen's avatar
      [PATCH] x86: Terminate the kernel stacks for the unwinder · 51ec28e1
      Andi Kleen authored
      Always make sure RIP/EIP is 0 in the registers stored on the top
      of the stack of a kernel thread. This makes sure the unwinder code
      won't try a fallback but knows the stack has ended.
      
      AK: this patch is a bit mysterious. in theory they should be terminated
      anyways, but it seems to fix at least one crash. Anyways double termination
      probably doesn't hurt.
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      51ec28e1
    • Andi Kleen's avatar
      [PATCH] i386: Fix PCI BIOS config space access · f015c6c4
      Andi Kleen authored
      Got broken by a earlier change.
      
      Also add a printk when no pci config method could be found.
      
      Cc: gregkh@suse.de
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      f015c6c4
    • Jon Mason's avatar
      [PATCH] x86-64: Calgary IOMMU: print PCI bus numbers in hex · 70d666d6
      Jon Mason authored
      Make the references to the bus number in hex instead of decimal, as
      that is the way that lspci prints out the bus numbers.
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      70d666d6
    • Jon Mason's avatar
      [PATCH] x86-64: Calgary IOMMU: Update Jon's contact info · d8d2bedf
      Jon Mason authored
      Also add copyright for work done after leaving IBM.
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      d8d2bedf
    • Jon Mason's avatar
      [PATCH] x86-64: Calgary IOMMU: Fix off by one when calculating register space location · 76fd2317
      Jon Mason authored
      The purpose of the code being modified is to determine the location
      of the calgary chip address space.  This is done by a magical formula
      of FE0MB-8MB*OneBasedChassisNumber+1MB*(RioNodeId-ChassisBase) to
      find the offset where BIOS puts it.  In this formula,
      OneBasedChassisNumber corresponds to the NUMA node, and rionodeid is
      always 2 or 3 depending on which chip in the system it is.  The
      problem was that we had an off by one error that caused us to account
      some busses to the wrong chip and thus give them the wrong address
      space.
      
      Fixes RH bugzilla #203971.
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      Signed-off-bu: Muli Ben-Yehuda <muli@il.ibm.com>
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      76fd2317
    • Jon Mason's avatar
      [PATCH] x86-64: Calgary IOMMU: deobfuscate calgary_init · dedc9937
      Jon Mason authored
      calgary_init's for loop does not correspond to the actual device being
      checked, which makes its upperbound check for array overflow useless.
      Changing this to a do-while loop is the correct way of doing this.
      There should be no possibility of spinning forever in this loop, as
      pci_get_device states that it will go through all iterations, then
      return NULL (thus breaking the loop).
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      dedc9937
    • Andi Kleen's avatar
      [PATCH] i386: Update defconfig · 814eadce
      Andi Kleen authored
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      814eadce
    • Andi Kleen's avatar
      [PATCH] x86-64: Update defconfig · a7441a39
      Andi Kleen authored
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      a7441a39
    • David Howells's avatar
      IRQ: Maintain regs pointer globally rather than passing to IRQ handlers · 7d12e780
      David Howells authored
      Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
      of passing regs around manually through all ~1800 interrupt handlers in the
      Linux kernel.
      
      The regs pointer is used in few places, but it potentially costs both stack
      space and code to pass it around.  On the FRV arch, removing the regs parameter
      from all the genirq function results in a 20% speed up of the IRQ exit path
      (ie: from leaving timer_interrupt() to leaving do_IRQ()).
      
      Where appropriate, an arch may override the generic storage facility and do
      something different with the variable.  On FRV, for instance, the address is
      maintained in GR28 at all times inside the kernel as part of general exception
      handling.
      
      Having looked over the code, it appears that the parameter may be handed down
      through up to twenty or so layers of functions.  Consider a USB character
      device attached to a USB hub, attached to a USB controller that posts its
      interrupts through a cascaded auxiliary interrupt controller.  A character
      device driver may want to pass regs to the sysrq handler through the input
      layer which adds another few layers of parameter passing.
      
      I've build this code with allyesconfig for x86_64 and i386.  I've runtested the
      main part of the code on FRV and i386, though I can't test most of the drivers.
      I've also done partial conversion for powerpc and MIPS - these at least compile
      with minimal configurations.
      
      This will affect all archs.  Mostly the changes should be relatively easy.
      Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
      
      	struct pt_regs *old_regs = set_irq_regs(regs);
      
      And put the old one back at the end:
      
      	set_irq_regs(old_regs);
      
      Don't pass regs through to generic_handle_irq() or __do_IRQ().
      
      In timer_interrupt(), this sort of change will be necessary:
      
      	-	update_process_times(user_mode(regs));
      	-	profile_tick(CPU_PROFILING, regs);
      	+	update_process_times(user_mode(get_irq_regs()));
      	+	profile_tick(CPU_PROFILING);
      
      I'd like to move update_process_times()'s use of get_irq_regs() into itself,
      except that i386, alone of the archs, uses something other than user_mode().
      
      Some notes on the interrupt handling in the drivers:
      
       (*) input_dev() is now gone entirely.  The regs pointer is no longer stored in
           the input_dev struct.
      
       (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking.  It does
           something different depending on whether it's been supplied with a regs
           pointer or not.
      
       (*) Various IRQ handler function pointers have been moved to type
           irq_handler_t.
      Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
      (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
      7d12e780
    • David Howells's avatar
      IRQ: Typedef the IRQ handler function type · da482792
      David Howells authored
      Typedef the IRQ handler function type.
      Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
      (cherry picked from 1356d1e5fd256997e3d3dce0777ab787d0515c7a commit)
      da482792
    • David Howells's avatar
      IRQ: Typedef the IRQ flow handler function type · 57a58a94
      David Howells authored
      Typedef the IRQ flow handler function type.
      Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
      (cherry picked from 8e973fbdf5716b93a0a8c0365be33a31ca0fa351 commit)
      57a58a94
    • Linus Torvalds's avatar
      Linux 2.6.19-rc1 · d223a601
      Linus Torvalds authored
      Merge window closed..
      d223a601
    • Mark Assad's avatar
      [PATCH] itmtouch: fix inverted flag to indicate touch location correctly, correct white space · 77dc2db6
      Mark Assad authored
      There is a bug in the current version of the itmtouch USB touchscreen
      driver.  The if statment that checks if pressure is being applied to the
      touch screen is now missing a ! (not), so events are no longer being
      reported correctly.
      
      The original source code for this line was as follows:
      
      	#define UCP(x) ((unsigned char*)(x))
      	#define UCOM(x,y,z) ((UCP((x)->transfer_buffer)[y]) & (z))
      
      	...
      	if (!UCOM(urb, 7, 0x20)) {
      
      And was cleaned to:
      
      	unsigned char *data = urb->transfer_buffer;
      	....
      	 if (data[7] & 0x20) {
      
      (note the lack of '!')
      
      This has been tested on an LG L1510BF and an LG1510SF touch screen.
      Signed-off-by: default avatarMark Assad <massad@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      77dc2db6
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6 · 4b844718
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6:
        [PA-RISC] Fix time.c for new do_timer() calling convention
        [PA-RISC] Fix must_check warnings in drivers.c
        [PA-RISC] Fix parisc_newuname()
        [PA-RISC] Remove warning from pci.c
        [PA-RISC] Fix filldir warnings
        [PA-RISC] Fix sys32_sysctl
        [PA-RISC] Fix sba_iommu compilation
      4b844718
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · a43cdf08
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] cell: fix bugs found by sparse
        [POWERPC] spiderpic: enable new style devtree support
        [POWERPC] Update cell_defconfig
        [POWERPC] spufs: add infrastructure for finding elf objects
        [POWERPC] spufs: support new OF device tree format
        [POWERPC] spufs: add support for read/write on cntl
        [POWERPC] spufs: remove support for ancient firmware
        [POWERPC] spufs: make mailbox functions handle multiple elements
        [POWERPC] spufs: use correct pg_prot for mapping SPU local store
        [POWERPC] spufs: Add infrastructure needed for gang scheduling
        [POWERPC] spufs: implement error event delivery to user space
        [POWERPC] spufs: fix context switch during page fault
        [POWERPC] spufs: scheduler support for NUMA.
        [POWERPC] spufs: cell spu problem state mapping updates
      a43cdf08
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 97d41e90
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (54 commits)
        [SCSI] Initial Commit of qla4xxx
        [SCSI] raid class: handle component-add errors
        [SCSI] SCSI megaraid_sas: handle thrown errors
        [SCSI] SCSI aic94xx: handle sysfs errors
        [SCSI] SCSI st: fix error handling in module init, sysfs
        [SCSI] SCSI sd: fix module init/exit error handling
        [SCSI] SCSI osst: add error handling to module init, sysfs
        [SCSI] scsi: remove hosts.h
        [SCSI] scsi: Scsi_Cmnd convertion in aic7xxx_old.c
        [SCSI] megaraid_sas: sets ioctl timeout and updates version,changelog
        [SCSI] megaraid_sas: adds tasklet for cmd completion
        [SCSI] megaraid_sas: prints pending cmds before setting hw_crit_error
        [SCSI] megaraid_sas: function pointer for disable interrupt
        [SCSI] megaraid_sas: frame count optimization
        [SCSI] megaraid_sas: FW transition and q size changes
        [SCSI] qla2xxx: Update version number to 8.01.07-k2.
        [SCSI] qla2xxx: Stall mid-layer error handlers while rport is blocked.
        [SCSI] qla2xxx: Add MODULE_FIRMWARE tags.
        [SCSI] qla2xxx: Add support for host port state FC transport attribute.
        [SCSI] qla2xxx: Add support for fabric name FC transport attribute.
        ...
      97d41e90
    • Matthew Wilcox's avatar
      [PA-RISC] Fix time.c for new do_timer() calling convention · 1604f318
      Matthew Wilcox authored
      do_timer now wants to know how many ticks have elapsed.  Now that we
      have to calculate that, we can eliminate some of the clever code that
      avoided having to calculate that.  Also add some more documentation.
      I'd like to thank Grant Grundler for helping me with this.
      Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
      1604f318
    • Matthew Wilcox's avatar
      [PA-RISC] Fix must_check warnings in drivers.c · 1070c965
      Matthew Wilcox authored
      Panic if we can't register the parisc bus or the root parisc device.
      There's no way we can boot without them, so let the user know ASAP.
      
      If we can't register a parisc device, handle the failure gracefully.
      Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
      1070c965
    • Matthew Wilcox's avatar
      [PA-RISC] Fix parisc_newuname() · f64ef295
      Matthew Wilcox authored
      The utsname virtualisation broke parisc_newuname compilation.
      Rewrite the implementation to call sys_newuname() like sparc64 does.
      Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
      f64ef295
    • Matthew Wilcox's avatar
      [PA-RISC] Remove warning from pci.c · ccd6c355
      Matthew Wilcox authored
      max() doesn't like comparing an unsigned long and a resource_size_t,
      so make the local variables resource_size_t too.
      Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
      ccd6c355
    • Matthew Wilcox's avatar
      [PA-RISC] Fix filldir warnings · 15c130c1
      Matthew Wilcox authored
      filldir_t now takes a u64, not an ino_t.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      15c130c1