1. 11 Jun, 2003 22 commits
    • Andrew Morton's avatar
      [PATCH] tmpfs: misc fixes · d69e1f7a
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      Remove shmem_nrpages, no use is made of it (even 2.4-ac, though it counts
      it, does nothing with it): reintroduce if it becomes useful.  Replace GPL
      oneliner by the block from 2.4-ac, extend Copyright to 2003, remove two
      white spaces.
      d69e1f7a
    • Andrew Morton's avatar
      [PATCH] tmpfs: swapoff-truncate race · a09677ae
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      Dissatisfied with earlier fix to race where swapoff sneaks page into tmpfs
      page cache after truncate_inode_pages cleaned it: calling it a second time
      can be too heavy, instead fix shmem_unuse_inode to check i_size.
      (Actually, one part of this fix is in the previous patch: shmem_file_write
      now has a hold on the page when it raises i_size.)
      a09677ae
    • Andrew Morton's avatar
      [PATCH] tmpfs: shmem_file_write EFAULT · dca33729
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      generic_file_aio_write_nolock has recently been corrected for when partial
      writes hit -EFAULT: now bring shmem_file_write into line.
      dca33729
    • Andrew Morton's avatar
      [PATCH] loop: don't lose PF_MEMDIE · 9001a6cb
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      loop_get_buffer loses PF_MEMDIE if it's added while in loop_copy_bio: not a
      high probability since it's not waiting there, but could happen, and sets a
      bad example (compare with add_to_swap fixed a while back).
      9001a6cb
    • Andrew Morton's avatar
      [PATCH] loop: copy_bio use highmem · 665cc275
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      loop_copy_bio uses one gfp_mask for bio_alloc and alloc_page calls.  The
      bio_alloc obviously can't use highmem, but the alloc_page can.  Yes, the
      underlying device might be unable to use highmem, and have to use one of
      its bounce buffers, with an extra copy: so be it.
      
      (Originally I did propagate the underlying device's bounce needs down to
      the loop device, to avoid that possible extra copy; but let's keep this
      simple, the low end doesn't have highmem and the high end can I/O it.)
      665cc275
    • Andrew Morton's avatar
      [PATCH] loop: remove blk_queue_bounce · c7616924
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      What purpose does loop_make_request's blk_queue_bounce serve?  None, it's
      just a relic from before the kmaps were added to loop's transfers, and ties
      up mempooled resources - in the file-backed case, with no guarantee they'll
      soon be freed.  And what purpose does loop_set_fd's blk_queue_bounce_limit
      serve?  None, blk_queue_make_request did that.
      c7616924
    • Andrew Morton's avatar
      [PATCH] loop: remove LO_FLAGS_BH_REMAP · d31f07fc
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      Jonah Sherman <jsherman@stuy.edu> pointed out back in February how
      LO_FLAGS_BH_REMAP is never actually set, since loop_init_xfer only calls
      the init for non-0 encryption type.  Fix that or scrap it?  Let's scrap it
      for now, that path (hacking values in bio instead of copying data) seems
      never to have been tested, and adds to the number of paths through loop:
      leave that optimization to some other occasion.
      d31f07fc
    • Andrew Morton's avatar
      [PATCH] loop: remove an IV · 5651a85c
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      Remove unused IV from loop_make_request (loop_transfer_bio does that).
      5651a85c
    • Andrew Morton's avatar
      [PATCH] loop: copy bio not data · be6c54d9
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      Remove copy flag and code from loop_copy_bio: wasn't used when reading, and
      waste of time when writing - the loop transfer function does that.  And
      don't initialize bio fields immediately reinitialized by caller.
      be6c54d9
    • Andrew Morton's avatar
      [PATCH] loop: loop bio renaming · 6e1cd5dd
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      Now it's in loop not bio, better rename bio_copy to loop_copy_bio: loop
      prefers names that way; and bio_transfer better named loop_transfer_bio.
      Rename bio,b to rbh,bio to follow call from loop_get_buffer more easily.
      6e1cd5dd
    • Andrew Morton's avatar
      [PATCH] loop: make bio_copy private to loop · ac5c28b4
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      bio_copy is used only by the loop driver, which already has to walk the bio
      segments itself: so it makes sense to change it from bio.c export to loop.c
      static, as prelude to working upon it there.
      
      bio_copy itself is unchanged by this patch, with one exception.  On oom
      failure it must use bio_put, instead of mempool_free to static bio_pool:
      which it should have been doing all along - it was leaking the veclist.
      
      (Grudgingly acked by Jens)
      ac5c28b4
    • Andrew Morton's avatar
      [PATCH] loop: file use highmem · 555bae04
      Andrew Morton authored
      From: Hugh Dickins <hugh@veritas.com>
      
      When loop restricts underlying file's allocation mask to avoid deadlock, it
      unintentionally masks out its highmem capability, making failures at the
      underlying level much more likely.
      555bae04
    • Andrew Morton's avatar
      [PATCH] MAINTAINERS: Compaq->HP · ecdd22ad
      Andrew Morton authored
      From: "Ni, Michael" <Michael.Ni@hp.com>
      
      s/Compaq/HP/ in MAINTAINERS.
      ecdd22ad
    • Andrew Morton's avatar
      [PATCH] irq_cpustat cleanup · 6cf1a17b
      Andrew Morton authored
      From: Christoph Hellwig <hch@lst.de>
      
      currently only x86_64 and ia64 don't use the generic irq_cpustat code
      and both have to workaround it's brokenness for the non-default case.
      
      x86_64 defines an empty irq_cpustat_t even if it doesn't need one and
      ia64 adds CONFIG_IA64 ifdefs around all users.  What about this patch
      instead to make __ARCH_IRQ_STAT useable?
      6cf1a17b
    • Linus Torvalds's avatar
      Manual merge · 95d70849
      Linus Torvalds authored
      95d70849
    • John Levon's avatar
      [PATCH] OProfile: fix init / exit routine · bf9ffe26
      John Levon authored
      Ensure that the arch exit routines are always called when needed,
      previously we could end up with a nasty crash if using oprofile.timer=1,
      or the FS register failed.
      bf9ffe26
    • John Levon's avatar
      [PATCH] OProfile: remove useless code · b043632b
      John Levon authored
      Remove some useless code, from Philippe Elie.
      b043632b
    • John Levon's avatar
      [PATCH] OProfile: update Changes · 6856f60e
      John Levon authored
      Update the version information.
      6856f60e
    • John Levon's avatar
      [PATCH] OProfile: Export task->tgid in the buffer · 76ff9e3f
      John Levon authored
      Export the task->tgid to userspace as well. This is needed
      for forthcoming thread profiling stuff and should have been
      done in the original patch ... oh well.
      
      This requires an upgrade to oprofile 0.5.3. You can get it from
      the website, or, for the impatient, here :
      
      	http://movementarian.org/oprofile-0.5.3.tar.gz
      76ff9e3f
    • Linus Torvalds's avatar
      Merge bk://ldm.bkbits.net/linux-2.5-core · 97ef4805
      Linus Torvalds authored
      into home.transmeta.com:/home/torvalds/v2.5/linux
      97ef4805
    • Patrick Mochel's avatar
      Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin · b6f43d8d
      Patrick Mochel authored
      into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
      b6f43d8d
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk/linux-2.5-rmk · 75006b98
      Linus Torvalds authored
      into home.transmeta.com:/home/torvalds/v2.5/linux
      75006b98
  2. 12 Jun, 2003 1 commit
    • Nicolas Pitre's avatar
      [ARM PATCH] 1540/2: fixes for gcc-3.3 · d76641fa
      Nicolas Pitre authored
      Patch from Nicolas Pitre
      
      > Patch #1540/1 has had the following note added:
      > 
      > Ok, it seems that we've had this for years and years, and it hasn't been
      > causing a problem.  We've now got -Wa,-mno-fpu which should catch anything
      > which shouldn't be used anyway.
      > 
      > Could you send a new patch for this change please?
      > 
      > Update by: Russell King
      
      Here it is.
      d76641fa
  3. 11 Jun, 2003 5 commits
  4. 12 Jun, 2003 4 commits
    • Dominik Brodowski's avatar
      [PCMCIA] Rename tcic.c socket_info_t · ea814ca7
      Dominik Brodowski authored
      Rename the socket_info_t inside tcic.c to struct tcic_socket. At one
      time there were at least five different "socket_info_t" within cardmgr
      / linux/drivers/pcmcia. Let's get rid of all of them to avoid
      confusion in future.
      ea814ca7
    • Dominik Brodowski's avatar
      [PCMCIA] rename i82365.c socket_info_t · 021830b2
      Dominik Brodowski authored
      Rename the socket_info_t inside tcic.c to struct i82365_socket. At one
      time there were at least five different "socket_info_t" within cardmgr
      / linux/drivers/pcmcia. Let's get rid of all of them to avoid
      confusion in future.
      021830b2
    • Dominik Brodowski's avatar
      [PCMCIA] i82365 depends on ISA. · 9493b334
      Dominik Brodowski authored
      The i82365 doesn't work unless CONFIG_ISA is set -- see this from
      i82365_init:
      
      ...
      
          sockets = 0;
      
      #ifdef CONFIG_ISA
          isa_probe();
      #endif
      
          if (sockets == 0) {
              printk("not found.\n");
              driver_unregister(&i82365_driver);
              return -ENODEV;
          }
      
      ...
      
      So, remove all instances of CONFIG_ISA from i82365.c and add a
      dependency to the Kconfig file.
      9493b334
    • Dominik Brodowski's avatar
      [PCMCIA] Remove socket_info_t · 91a32a40
      Dominik Brodowski authored
      Get rid of the
      
      typedef struct pcmcia_socket socket_info_t;
      
      by replacing all remaining usages of cs_internal's socket_info_t with
      struct pcmcia_socket.
      91a32a40
  5. 11 Jun, 2003 8 commits
    • Dominik Brodowski's avatar
      [PCMCIA] unify yenta.c and pci_socket.c · 5ec72d2e
      Dominik Brodowski authored
      Linus said [on April 25th of this year]:
      > There are two reasons I did pci_socket, and one of them is stale
      > and the other one is a matter of taste.
      
      As the second reason is stale now, too, unify yenta.c and
      pci_socket.c.
      5ec72d2e
    • Dominik Brodowski's avatar
      [PCMCIA] Make ds.c use pcmcia_socket->sock rather than local version. · 7e5ca9e1
      Dominik Brodowski authored
      Remove socket_no from struct pcmcia_bus_socket - it's only used in
      printks, and the one additional level of indirection doesn't hurt there.
      
       ds.c |   10 ++++------
       1 files changed, 4 insertions(+), 6 deletions(-)
      7e5ca9e1
    • Dominik Brodowski's avatar
      [PCMCIA] Replace more socket numbers with pcmcia_socket · 35f7f006
      Dominik Brodowski authored
      Replace the socket number with struct pcmcia_socket from mtd_bind_t
      and bind_req_t.
      
       drivers/pcmcia/cs.c |    4 ++--
       drivers/pcmcia/ds.c |    6 +++---
       include/pcmcia/cs.h |    4 ++--
       3 files changed, 7 insertions(+), 7 deletions(-)
      35f7f006
    • Dominik Brodowski's avatar
      [PCMCIA] socket reference in client_t · cd0966e4
      Dominik Brodowski authored
      As "socket_no" is deprecated, replace it with struct pcmcia_socket in 
      client_handle_t.
      
       bulkmem.c     |    4 ++--
       cs.c          |   22 ++++++++++------------
       cs_internal.h |    4 ++--
       3 files changed, 14 insertions(+), 16 deletions(-)
      cd0966e4
    • Russell King's avatar
    • Dominik Brodowski's avatar
      [PCMCIA] Callbacks use pcmcia_socket not integer. · b5ab04dc
      Dominik Brodowski authored
      This patch updates the callbacks to the socket drivers to take the
      corresponding struct pcmcia_socket as argument instead of the "socket
      number".
      
       drivers/pcmcia/bulkmem.c    |    6 +++---
       drivers/pcmcia/cistpl.c     |    4 ++--
       drivers/pcmcia/cs.c         |   18 +++++++++---------
       drivers/pcmcia/i82092.c     |   36 +++++++++++++++++++++++-------------
       drivers/pcmcia/i82092aa.h   |   20 ++++++++++----------
       drivers/pcmcia/i82365.c     |   34 +++++++++++++++++++++++-----------
       drivers/pcmcia/pci_socket.c |   40 ++++++++++++++++++++--------------------
       drivers/pcmcia/rsrc_mgr.c   |    2 +-
       drivers/pcmcia/tcic.c       |   35 ++++++++++++++++++-----------------
       include/pcmcia/ss.h         |   22 ++++++++++++----------
       10 files changed, 121 insertions(+), 96 deletions(-)
      b5ab04dc
    • Russell King's avatar
      [PCMCIA] Update SA11xx PCMCIA support for recent changes. · 63159f81
      Russell King authored
      Re-enable the suspend and resume methods for SA11xx PCMCIA devices,
      and update the initialisation/cleanup code for Dominik's recent
      changes.
      63159f81
    • Dominik Brodowski's avatar
      [PCMCIA] register · 9014144e
      Dominik Brodowski authored
      Add a more sane socket registration interface.
      
      Previously, it was messed up because Greg's struct class hadn't been
      invented when I wrote the code: there may be multiple sockets per
      "struct device", and there is the need for one "struct class_device"
      for each socket.
      
       drivers/pcmcia/cs.c         |  217 +++++++++++++++++++++----------------------- drivers/pcmcia/ds.c         |   56 ++---------
       drivers/pcmcia/i82092.c     |   48 ++++-----
       drivers/pcmcia/i82365.c     |   41 ++++----
       drivers/pcmcia/pci_socket.c |   23 +---
       drivers/pcmcia/pci_socket.h |    2
       drivers/pcmcia/tcic.c       |   38 ++++---
       include/pcmcia/ss.h         |   25 +++--
       8 files changed, 210 insertions(+), 240 deletions(-)
      9014144e