1. 07 10月, 2006 2 次提交
    • S
      [POWERPC] Update iseries_defconfig · b75f3f75
      Stephen Rothwell 提交于
      This make sure that an iseries_defconfig does not inlude
      other platforms.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      b75f3f75
    • O
      [POWERPC] Fix fsl_soc build breaks · 2b00b254
      Olof Johansson 提交于
      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: NOlof Johansson <olof@lixom.net>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      2b00b254
  2. 06 10月, 2006 26 次提交
  3. 05 10月, 2006 12 次提交
    • D
      IRQ: Maintain regs pointer globally rather than passing to IRQ handlers · 7d12e780
      David Howells 提交于
      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: NDavid Howells <dhowells@redhat.com>
      (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
      7d12e780
    • D
      IRQ: Typedef the IRQ handler function type · da482792
      David Howells 提交于
      Typedef the IRQ handler function type.
      Signed-Off-By: NDavid Howells <dhowells@redhat.com>
      (cherry picked from 1356d1e5fd256997e3d3dce0777ab787d0515c7a commit)
      da482792
    • D
      IRQ: Typedef the IRQ flow handler function type · 57a58a94
      David Howells 提交于
      Typedef the IRQ flow handler function type.
      Signed-Off-By: NDavid Howells <dhowells@redhat.com>
      (cherry picked from 8e973fbdf5716b93a0a8c0365be33a31ca0fa351 commit)
      57a58a94
    • L
      Linux 2.6.19-rc1 · d223a601
      Linus Torvalds 提交于
      Merge window closed..
      d223a601
    • M
      [PATCH] itmtouch: fix inverted flag to indicate touch location correctly, correct white space · 77dc2db6
      Mark Assad 提交于
      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: NMark Assad <massad@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      77dc2db6
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6 · 4b844718
      Linus Torvalds 提交于
      * 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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · a43cdf08
      Linus Torvalds 提交于
      * 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
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 97d41e90
      Linus Torvalds 提交于
      * 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
    • M
      [PA-RISC] Fix time.c for new do_timer() calling convention · 1604f318
      Matthew Wilcox 提交于
      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: NMatthew Wilcox <willy@parisc-linux.org>
      1604f318
    • M
      [PA-RISC] Fix must_check warnings in drivers.c · 1070c965
      Matthew Wilcox 提交于
      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: NMatthew Wilcox <willy@parisc-linux.org>
      1070c965
    • M
      [PA-RISC] Fix parisc_newuname() · f64ef295
      Matthew Wilcox 提交于
      The utsname virtualisation broke parisc_newuname compilation.
      Rewrite the implementation to call sys_newuname() like sparc64 does.
      Signed-off-by: NMatthew Wilcox <willy@parisc-linux.org>
      f64ef295
    • M
      [PA-RISC] Remove warning from pci.c · ccd6c355
      Matthew Wilcox 提交于
      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: NMatthew Wilcox <willy@parisc-linux.org>
      ccd6c355