1. 13 3月, 2007 5 次提交
    • S
      [POWERPC] bootwrapper: Add ft_root_node(). · 7c71c046
      Scott Wood 提交于
      Clean up some of the open-coded data structure references by providing a
      function to return a pointer to the tree's root node.  This is only used
      in high-level functions trying to access the root of the tree, not in
      low-level code that is actually manipulating the data structure.
      Signed-off-by: NScott Wood <scottwood@freescale.com>
      Acked-by: NMark A. Greer <mgreer@mvista.com>
      Acked-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      7c71c046
    • S
      [POWERPC] bootwrapper: Add stddef.h to ops.h · ce3edb30
      Scott Wood 提交于
      ops.h references NULL, so include stddef.h, so files including ops.h
      don't have to.
      Signed-off-by: NScott Wood <scottwood@freescale.com>
      Acked-by: NMark A. Greer <mgreer@mvista.com>
      Acked-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      ce3edb30
    • D
      [POWERPC] zImage: Cleanup and improve zImage entry point · cd197ffc
      David Gibson 提交于
      This patch re-organises the way the zImage wrapper code is entered, to
      allow more flexibility on platforms with unusual entry conditions.
      After this patch, a platform .o file has two options:
      
      1) It can define a _zimage_start, in which case the platform code gets
         control from the very beginning of execution.  In this case the
         platform code is responsible for relocating the zImage if necessary,
         clearing the BSS, performing any platform specific initialization, and
         finally calling start() to load and enter the kernel.
      
      2) It can define platform_init().  In this case the generic crt0.S
         handles initial entry, and calls platform_init() before calling
         start().  The signature of platform_init() is changed, however, to
         take up to 5 parameters (in r3..r7) as they come from the platform's
         initial loader, instead of a fixed set of parameters based on OF's
         usage.
      
         When using the generic crt0.S, the platform .o can optionally
         supply a custom stack to use, using the BSS_STACK() macro.  If this
         is not supplied, the crt0.S will assume that the loader has
         supplied a usable stack.
      
      In either case, the platform code communicates information to the
      generic code (specifically, a PROM pointer for OF systems, and/or an
      initrd image address supplied by the bootloader) via a global
      structure "loader_info".
      
      In addition the wrapper script is rearranged to ensure that the
      platform .o is always linked first.  This means that platforms where
      the zImage entry point is at a fixed address or offset, rather than
      being encoded in the binary header can be supported using option (1).
      Signed-off-by: NDavid Gibson <dwg@au1.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      cd197ffc
    • D
      [POWERPC] zImage: Cleanup and improve prep_kernel() · 79c85419
      David Gibson 提交于
      This patch rewrites prep_kernel() in the zImage wrapper code to be
      clearer and more flexible.  Notable changes:
      
      	- Handling of the initrd image from prep_kernel() has moved
      into a new prep_initrd() function.
      	- The address of the initrd image is now added as device tree
      properties, as the kernel expects.
      	- We only copy a packaged initrd image to a new location if it
      is in danger of being clobbered when the kernel moves to its final
      location, instead of always.
      	- By default we decompress the kernel directly to address 0,
      instead of requiring it to relocate itself.  Platforms (such as OF)
      where doing this could clobber still-live firmware data structures can
      override the vmlinux_alloc hook to provide an alternate place to
      decompress the kernel.
      	- We no longer pass lots of information between functions in
      global variables.
      Signed-off-by: NDavid Gibson <dwg@au1.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      79c85419
    • D
      [POWERPC] zImage: Add more flexible gunzip convenience functions · ad9d2716
      David Gibson 提交于
      At present, arch/powerpc/boot/main.c includes a gunzip() function
      which is a convenient wrapper around zlib.  However, it doesn't
      conveniently allow decompressing part of an image to one location,
      then the remainder to a different address.
      
      This patch adds a new set of more flexible convenience wrappers around
      zlib, moving them to their own file, gunzip_util.c, in the process.
      These wrappers allow decompressing sections of the compressed image to
      different locations.  In addition, they transparently handle
      uncompressed data, avoiding special case code to handle uncompressed
      vmlinux images.
      
      The patch also converts main.c to use the new wrappers, using the new
      flexibility to avoid decompressing the vmlinux's ELF header twice as
      we did previously.  That in turn means we avoid extending our
      allocations for the vmlinux to allow space for the extra copy of the
      ELF header.
      Signed-off-by: NDavid Gibson <dwg@au1.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      ad9d2716
  2. 09 3月, 2007 17 次提交
  3. 08 3月, 2007 13 次提交
  4. 07 3月, 2007 5 次提交
    • L
      Linux 2.6.21-rc3 · 08e15e81
      Linus Torvalds 提交于
      .. hopefully most of the resume/suspend problems introduced by the timer
      and other changes are behind us.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      08e15e81
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 2f774456
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fix floppy build failure.
      2f774456
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 5b3c1184
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [DCCP]: Set RTO for newly created child socket
        [DCCP]: Correctly split CCID half connections
        [NET]: Fix compat_sock_common_getsockopt typo.
        [NET]: Revert incorrect accept queue backlog changes.
        [INET]: twcal_jiffie should be unsigned long, not int
        [GIANFAR]: Fix compile error in latest git
        [PPPOE]: Use ifindex instead of device pointer in key lookups.
        [NETFILTER]: ip6_route_me_harder should take into account mark
        [NETFILTER]: nfnetlink_log: fix reference counting
        [NETFILTER]: nfnetlink_log: fix module reference counting
        [NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference
        [NETFILTER]: nfnetlink_log: fix NULL pointer dereference
        [NETFILTER]: nfnetlink_log: fix use after free
        [NETFILTER]: nfnetlink_log: fix reference leak
        [NETFILTER]: tcp conntrack: accept SYN|URG as valid
        [NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
        [NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops
      5b3c1184
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · fe1b4ba4
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] cio: Call cancel_halt_clear even when actl == 0.
        [S390] cio: Use path verification to check for path state.
        [S390] cio: Fix locking when calling notify function.
        [S390] Fixed handling of access register mode faults.
        [S390] dasd: Use default recovery for SNSS requests
        [S390] check_bugs() should be inline.
        [S390] tape: Compression overwrites crypto setting
        [S390] nss: disable kexec.
        [S390] reipl: move dump_prefix_page out of text section.
        [S390] smp: disable preemption in smp_call_function/smp_call_function_on
        [S390] kprobes breaks BUG_ON
      fe1b4ba4
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · ae5dd8e3
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_pdc202xx_old: fix data corruption and other problems
        pata_legacy: fix io/irq mismatch
        ahci: RAID mode SATA patch for Intel ICH9M
      ae5dd8e3