1. 27 6月, 2009 7 次提交
    • T
      asm-generic/vmlinux.lds.h: shuffle INIT_TASK* macro names in vmlinux.lds.h · 39a449d9
      Tim Abbott 提交于
      We recently added a INIT_TASK(align) in include/asm-generic/vmlinux.lds.h,
      but there is already a macro INIT_TASK in include/linux/init_task.h, which
      is quite confusing.  We should switch the macro in the linker script to
      INIT_TASK_DATA. (Sorry that I missed this in reviewing the patch).  Since
      the macros are new, there is only one user of the INIT_TASK in
      vmlinux.lds.h, arch/mn10300/kernel/vmlinux.lds.S.
      
      However, we are currently using INIT_TASK_DATA for laying down an entire
      .data.init_task section.  So rename that to INIT_TASK_DATA_SECTION.
      
      I would be worried about changing the meaning of INIT_TASK_DATA, but the
      old INIT_TASK_DATA implementation had no users, and in fact if anyone had
      tried to use it, it would have failed to compile because it didn't pass
      the alignment to the old INIT_TASK.
      Signed-off-by: NTim Abbott <tabbott@ksplice.com>
      Cc: David Howells <dhowells@redhat.com>
      Cc: Jesper Nilsson <Jesper.Nilsson@axis.com
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      39a449d9
    • T
      Add new macros for page-aligned data and bss sections. · d2af12ae
      Tim Abbott 提交于
      This patch is preparation for replacing most uses of
      ".bss.page_aligned" and ".data.page_aligned" in the kernel with
      macros, so that the section name can later be changed without having
      to touch a lot of the kernel.
      
      The long-term goal here is to be able to change the kernel's magic
      section names to those that are compatible with -ffunction-sections
      -fdata-sections.  This requires renaming all magic sections with names
      of the form ".data.foo".
      Signed-off-by: NTim Abbott <tabbott@ksplice.com>
      Acked-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      d2af12ae
    • P
      asm-generic/vmlinux.lds.h: Fix up RW_DATA_SECTION definition. · 73f1d939
      Paul Mundt 提交于
      RW_DATA_SECTION is defined to take 4 different alignment parameters,
      while NOSAVE_DATA currently uses a fixed PAGE_SIZE alignment as noted
      in the comments.
      
      There are presently no in-tree users of this at present, and I just
      stumbled across this while implementing the simplified script on a new
      architecture port, which subsequently resulted in a syntax error.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      73f1d939
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 4075ea8c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        amd64_edac: misc small cleanups
        amd64_edac: fix ecc_enable_override handling
        amd64_edac: check only ECC bit in amd64_determine_edac_cap
      4075ea8c
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 919a6d10
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (29 commits)
        powerpc/rtas: Fix watchdog driver temperature read functionality
        powerpc/mm: Fix potential access to freed pages when using hugetlbfs
        powerpc/440: Fix warning early debug code
        powerpc/of: Fix usage of dev_set_name() in of_device_alloc()
        powerpc/pasemi: Use raw spinlock in SMP TB sync
        powerpc: Use one common impl. of RTAS timebase sync and use raw spinlock
        powerpc/rtas: Turn rtas lock into a raw spinlock
        powerpc: Add irqtrace support for 32-bit powerpc
        powerpc/BSR: Fix BSR to allow mmap of small BSR on 64k kernel
        powerpc/BSR: add 4096 byte BSR size
        powerpc: Map more memory early on 601 processors
        powerpc/pmac: Fix DMA ops for MacIO devices
        powerpc/mm: Make k(un)map_atomic out of line
        powerpc: Fix mpic alloc warning
        powerpc: Fix output from show_regs
        powerpc/pmac: Fix issues with PowerMac "PowerSurge" SMP
        powerpc/amigaone: Limit ISA I/O range to 4k in the device tree
        powerpc/warp: Platform fix for i2c change
        powerpc: Have git ignore generated files from dtc compile
        powerpc/mpic: Fix mapping of "DCR" based MPIC variants
        ...
      919a6d10
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · cf2acfb2
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
        ACPI: video: prevent NULL deref in acpi_get_pci_dev()
        eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go
        eeepc-laptop: get the right value for CMSG
        eeepc-laptop: makes get_acpi() returns -ENODEV
        eeepc-laptop: right parent device
        eeepc-laptop: rfkill refactoring
        eeepc-laptop.c: use pr_fmt and pr_<level>
        eeepc-laptop: Register as a pci-hotplug device
      cf2acfb2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · aada1bc9
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] remove unknown mount option warning message
        [CIFS] remove bkl usage from umount begin
        cifs: Fix incorrect return code being printed in cFYI messages
        [CIFS] cleanup asn handling for ntlmssp
        [CIFS] Copy struct *after* setting the port, instead of before.
        cifs: remove rw/ro options
        cifs: fix problems with earlier patches
        cifs: have cifs parse scope_id out of IPv6 addresses and use it
        [CIFS] Do not send tree disconnect if session is already disconnected
        [CIFS] Fix build break
        cifs: display scopeid in /proc/mounts
        cifs: add new routine for converting AF_INET and AF_INET6 addrs
        cifs: have cifs_show_options show forceuid/forcegid options
        cifs: remove unneeded NULL checks from cifs_show_options
      aada1bc9
  2. 26 6月, 2009 33 次提交