1. 11 Nov, 2004 27 commits
  2. 10 Nov, 2004 13 commits
    • Linus Torvalds's avatar
      Fix the fix. · ccaf8b47
      Linus Torvalds authored
      Silly #endif placement problem.
      ccaf8b47
    • Arnaldo Carvalho de Melo's avatar
      [PATCH] fix platform_rename_gsi related ia32 build breakage · 12ec4455
      Arnaldo Carvalho de Melo authored
      "platform_rename_gsi" does not exist unless CONFIG_ACPI_BOOT is defined.
      12ec4455
    • Linus Torvalds's avatar
      Merge bk://kernel.bkbits.net/davem/net-2.6 · 2a307209
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      2a307209
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · ab0af3d4
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      ab0af3d4
    • Nicolas Pitre's avatar
      [ARM PATCH] 2160/1: allow modules to work with XIP kernel · f05ee516
      Nicolas Pitre authored
      Patch from Nicolas Pitre
      
      This should be applied on top of patch #2154/1.
      
      This maps the XIP kernel in the same virtual area as used for kernel
      modules instead of the previous arbitrary location.  Doing so has the
      advantage of having a well defined kernel address not conflicting
      with the different definitions for VMALLOC_END, as well as making
      modules loadable without any indirect long branch calls.  The work
      on XIPable MTD also requires this with code marked __xipram for the
      same reason.
      
      This of course reduces the space available for kernel modules from
      16MB to either 14MB or 12MB depending on the size of the resulting 
      kernel but that shouldn't be a real issue at all, given that the
      whole purpose behind XIP is to execute as much stuff from flash, 
      which is better achieved by compiling drivers in the kernel directly.
      
      Signed-off-by: Nicolas Pitre 
      Signed-off-by: Russell King
      f05ee516
    • Nicolas Pitre's avatar
      [ARM PATCH] 2154/2: XIP kernel for ARM · 457450ab
      Nicolas Pitre authored
      Patch from Nicolas Pitre
      
      This patch allows for the kernel to be configured for XIP.
      A lot of people are using semi hacked up XIP patches already so
      it is a good idea to have a generic and clean implementation 
      supporting all ARM targets. The patch isn't too intrusive.
      
      It involves:
      
      - modifying the kernel entry code to map separate .text and .data
        sections in the initial page table, as well as relocating
        .data to ram when needed
      
      - modifying the linker script to account for the different VMA and
        LMA for .data, as well as making sure that .init.data gets
        relocated to ram
      
      - adding the final kernel mapping with a new MT_ROM mem type
      
      - distinguishing between XIP and non-XIP for bootmem and memory
        resource declaration
      
      - and adding proper target handling to Makefiles.
      
      While at it, this also cleans up the kernel boot code a bit
      so the kernel can now be compiled for any address in ram,
      removing the need for a relation between kernel address and
      start of ram.  Also throws in some more comments.
      
      And finally the _text, _etext, _end and similar variables are now
      declared extern void instead of extern char, or even extern int.
      That allows for operations on their address directly without any
      cast, and trying to reference them by mistake would yield an 
      error which is a good thing.
      
      Tested both configurations: XIP and non XIP, the later 
      producing a kernel for execution from ram just as before.
      
      Signed-off-by: Nicolas Pitre 
      Signed-off-by: Russell King
      457450ab
    • Ben Dooks's avatar
      [ARM PATCH] 2225/1: S3C2410 - export symbol from s3c2440-dsc.c · d8eea8e7
      Ben Dooks authored
      Patch from Ben Dooks
      
      Added symbol export to the file, and cleaned up the
      un-necessary include files
      
      Signed-off-by: Ben Dooks 
      Signed-off-by: Russell King
      d8eea8e7
    • David S. Miller's avatar
      Merge nuts.davemloft.net:/disk1/BK/network-2.6 · 2d2ddfcd
      David S. Miller authored
      into nuts.davemloft.net:/disk1/BK/net-2.6
      2d2ddfcd
    • Chris Wright's avatar
      [PATCH] binfmt_elf: handle partial reads gracefully · ad49d6ba
      Chris Wright authored
      Make sure kernel reads full size of elf data.  Error out if mmap fails
      when mapping any sections of the executable.  Make sure interpreter
      string is NULL terminated. 
      Signed-off-by: default avatarChris Wright <chrisw@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      ad49d6ba
    • Theodore Y. Ts'o's avatar
      [PATCH] Licencing of drivers/char/rocket.c · bea14a1c
      Theodore Y. Ts'o authored
      On Tue, Nov 09, 2004 at 01:38:11PM -0600, Jason.Jorgensen@comtrol.com wrote:
           On Tuesday, November 09, 2004 10:58 AM, Theodore Ts'o <tytso@mit.edu> wrote:
          > I developed the Rocketport device driver under contract of Comtrol,
          > with the understanding that the resulting device driver would be
          > released under the GPL.  So I believe the correct way of resolving the
          > conflicting copyright statements is to delete the following lines.
          > 
          > It would be good to get positive confirmation from Comtrol as well
          > that this is their understanding as well. 
         
           You are absolutely correct. That notice slipped by us and should not be in
           there. 
         
           If someone with access to the mainline source could remove that for us we
           would appreciate it.
      
      Cc: Keith.Hammerbeck@comtrol.com, Steve.Erler@comtrol.com
      Acked-by: Jason.Jorgensen@comtrol.com
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@thunk.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      bea14a1c
    • Dinakar Guniguntala's avatar
      [PATCH] Fix do_wait race · 607acf00
      Dinakar Guniguntala authored
      Only set the flag in the cases when the exit state is not either
      TASK_DEAD or TASK_ZOMBIE.
      
      (TASK_DEAD or TASK_ZOMBIE will either race or we'll return the 
      information, so no need to note them).
      
      I confirmed that this fixes the problem and I also ran some LTP tests
      Signed-off-by: default avatarDinakar Guniguntala <dino@in.ibm.com>
      Signed-off-by: default avatarSripathi Kodi <sripathik@in.ibm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      607acf00
    • Anton Altaparmakov's avatar
      Merge cantab.net:/home/src/bklinux-2.6 · d9621fa0
      Anton Altaparmakov authored
      into cantab.net:/home/src/ntfs-2.6-devel
      d9621fa0
    • Anton Altaparmakov's avatar
      Merge ssh://linux-ntfs@bkbits.net/ntfs-2.6-devel · af81e654
      Anton Altaparmakov authored
      into cantab.net:/home/src/ntfs-2.6-devel
      af81e654