1. 13 Apr, 2004 17 commits
  2. 12 Apr, 2004 23 commits
    • Linus Torvalds's avatar
      Merge http://lia64.bkbits.net/to-linus-2.5 · 1740c41c
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      1740c41c
    • Linus Torvalds's avatar
      Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6 · 4c268c6b
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      4c268c6b
    • Linus Torvalds's avatar
      Merge bk://gkernel.bkbits.net/libata-2.6 · 6cd7a7d1
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      6cd7a7d1
    • Linus Torvalds's avatar
      Merge NFS conflicts · 193ce3be
      Linus Torvalds authored
      193ce3be
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia · f2d816ef
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      f2d816ef
    • Randy Dunlap's avatar
      [PCMCIA] init_pcmcia_cs() to return error from class_register() · 7347d800
      Randy Dunlap authored
      Patch from: Randy Dunlap
      
      From: Walter Harms
      
      Now init_pcmcia_cs() returns the result of class_register().
      Therefore init_pcmcia_cs() will possibly return an error.
      7347d800
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk/linux-2.6-serial · 5566c10d
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      5566c10d
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · 0d61fc5e
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      0d61fc5e
    • Randy Dunlap's avatar
      [ARM] use errno #defines in assembly · f2eb250f
      Randy Dunlap authored
      Patch from: Randy Dunlap
      
      From: Danilo Piazzalunga
      
      Some assembly code (on various archs) either
       1. uses hardcoded errno numbers instead of the canonical macro
          names, or
       2. defines them locally, instead of including the appropriate
          header (while including other headers).
      
      This patch "fixes" such usage in
       - getuser.S for arm
       - putuser.S for arm
      f2eb250f
    • Linus Torvalds's avatar
      Delete unused files in sound/oss · eb880e54
      Linus Torvalds authored
      From Herbert Xu; the files aren't used anywhere, and
      shouldn't be there in the first place.
      eb880e54
    • Andrew Morton's avatar
      [PATCH] Oprofile: ARM/XScale PMU driver · 469e04de
      Andrew Morton authored
      From: Zwane Mwaikambo <zwane@linuxpower.ca>
      
      The following patch adds support for the XScale performance monitoring unit
      to OProfile.  It uses not only the performance monitoring counters, but
      also the clock cycle counter (CCNT) allowing for upto 5 usable counters.
      
      The code has been developed and tested on an IOP331 (hardware courtesy of
      Intel) therefore i haven't been able to test it on XScale PMU1 systems. 
      Testing on said systems would be appreciated, and if done, please uncomment
      the #define DEBUG line at the top of op_model_xscale.c
      
      OProfile userspace support has already been committed and should be
      available via CVS.
      469e04de
    • Andrew Morton's avatar
      [PATCH] pmdisk is x86 only · 6451af4d
      Andrew Morton authored
      Only x86 implements pmdisk_arch_suspend().  So mark pmdisk as ia32-only, to
      avoid breaking allyesconfig.
      6451af4d
    • Andrew Morton's avatar
      [PATCH] cciss_scsi warning · f2b12e09
      Andrew Morton authored
      drivers/block/cciss_scsi.c: In function `scsi_cmd_stack_free':
      drivers/block/cciss_scsi.c:241: warning: cast from pointer to integer of different size
      f2b12e09
    • Andrew Morton's avatar
      [PATCH] cciss: /proc fix · e43bd869
      Andrew Morton authored
      From: <mikem@beardog.cca.cpqcorp.net>
      
      This patch fixes a bug where /proc displays 1 less logical volume than is
      actually configured.  This causes problems for some installers.
      e43bd869
    • Andrew Morton's avatar
      [PATCH] JBD: BH_Revoke cleanup · c28abd70
      Andrew Morton authored
      Use the bh bit test/set infrastructure rather than open-coding everything. 
      No functional changes.
      c28abd70
    • Andrew Morton's avatar
      [PATCH] Add CONFIG_SYSFS · d0d15d84
      Andrew Morton authored
      From: Patrick Mochel <mochel@digitalimplant.org>
      
      Here is a patch to make sysfs optional.  Note that with CONFIG_SYSFS=n you
      must specify the boot device's major:minor on the kernel boot command line
      with
      
      	root=03:01
      
      For embedded systems, it will save a significant amount of memory during
      runtime.  And, it saves 4k from the built kernel image for me.
      d0d15d84
    • Andrew Morton's avatar
      [PATCH] parport: no procfs warning fix · e4730c3e
      Andrew Morton authored
      drivers/parport/procfs.c: In function `parport_default_proc_unregister':
      drivers/parport/procfs.c:529: warning: `return' with a value, in function returning void
      e4730c3e
    • Andrew Morton's avatar
      [PATCH] kbuild: external module support · 07e58231
      Andrew Morton authored
      From: Sam Ravnborg <sam@ravnborg.org>
      
      Based on initial patch from Andreas Gruenbacher there is now better support
      for building external modules with kbuild.
      
      The preferred syntax is now:
      make -C $KERNELSRC M=$PWD
      
      but the old syntax:
      make -C $KERNELSRC SUBDIRS=$PWD modules
      will remain supported.
      
      The major differences compared to before are that:
      1) No attempt is made to neither check nor update any files in $KERNELSRC
      2) Module versions are now supported
      
      During stage 2 of kernel compilation where the modules are built, a new file
      Module.symvers is created.  This file contains the version for all symbols
      exported by the kernel and any module compiled within the kernel tree.
      
      When the external module is build the Module.symvers file is being read and
      symbol versions are used from that file.
      
      The purpose of avoiding any updates in the kernel src is that usually in a
      distribution the kernel src will be read-only, and there is no need to try to
      update it.  And when building an external module the focus is on the module,
      not the kernel.
      
      I expect the distributions will start using something like this:
      
      kernel src - with no generated files. Not even .config:
      /usr/src/linux-<version>
      
      Output from build:
      /lib/modules/linux-<version>/build
      
      where build is a real directory with relevant output files and the
      appropriate .config.
      
      I have some Documentation in the pipe-line, but wants to see how this
      approach is received before completing it.
      
      This patch is made on top of the previously posted patch to divide
      make clean in three steps.
      
      And you may need to edit the following line in the patch to make it apply:
       %docs: scripts_basic FORCE
      to
       %docs: scripts FORCE
      07e58231
    • Andrew Morton's avatar
      [PATCH] kbuild: cleaning in three steps · a065cde3
      Andrew Morton authored
      From: Sam Ravnborg <sam@ravnborg.org>
      
      Previously 'make clean' deleted all automatically generated files.  The
      following patch revert this behaviour, and now 'make clean' leaves enough
      behind to allow external modules to be built.
      
      The cleaning is now done in three steps:
      
      make clean     - delete everything not needed for building external modules
      make mrproper  - delete all generated files, including .config
      make distclean - delete all temporary files such as *.orig, *~, *.rej etc.
      
      This fixes reports about nvidia and vmware build issues.
      a065cde3
    • Andrew Morton's avatar
      [PATCH] Make %docs depend on scripts_basic · c70b9371
      Andrew Morton authored
      From: Sam Ravnborg <sam@ravnborg.org>
      
      From: Herbert Xu <herbert@gondor.apana.org.au>
      
      It seems that the %docs targets only needs scripts_basic.  The following
      patch does just that.  This removes its dependency on the existence of a
      .config file.
      c70b9371
    • Andrew Morton's avatar
      [PATCH] fb_copy_cmap() fix · 9a6c9ba2
      Andrew Morton authored
      From: Arjan van de Ven <arjanv@redhat.com>
      
      fb_copy_cmap() takes an argument about wether to do memcpy, copy_from_user or
      copy_to_user.  0 is memcpy, 2 is copy_to_user.  In the ioctl you want
      copy_to_user for copying the colormap to userspace.
      9a6c9ba2
    • Andrew Morton's avatar
      [PATCH] framebuffer bugfix · e01d652a
      Andrew Morton authored
      From: Arjan van de Ven <arjanv@redhat.com>
      
      Patch below fixes a thinko in the frame buffer drivers; the code does
      
      cursor.image.data = kmalloc(size, GFP_KERNEL);
      ....
      cursor.mask = kmalloc(size, GFP_KERNEL);
      ....
                      if (copy_from_user(&cursor.image.data, sprite->image.data, size) ||
                          copy_from_user(cursor.mask, sprite->mask, size)) {
      ....
      
      where it's clear that the & in the first copy_from_user is utterly bogus
      since the destination is the content of the newly allocated buffer, and not
      the pointer to it as the code does.
      e01d652a
    • Andrew Morton's avatar
      [PATCH] BSD accounting oops fix · 7285840f
      Andrew Morton authored
      oopses have been reported in do_acct_process(), with premption enabled, when
      threaded applications are exitting.
      
      It appears that we're racing with another thread which is nulling out
      current->tty.  I think this race is still there after we moved current->tty
      into current->signal->tty, so let's take the needed lock.
      7285840f