1. 08 5月, 2007 12 次提交
  2. 07 5月, 2007 6 次提交
    • L
      Revert "[PATCH] x86: __pa and __pa_symbol address space separation" · e3ebadd9
      Linus Torvalds 提交于
      This was broken.  It adds complexity, for no good reason.  Rather than
      separate __pa() and __pa_symbol(), we should deprecate __pa_symbol(),
      and preferably __pa() too - and just use "virt_to_phys()" instead, which
      is more readable and has nicer semantics.
      
      However, right now, just undo the separation, and make __pa_symbol() be
      the exact same as __pa().  That fixes the bugs this patch introduced,
      and we can do the fairly obvious cleanups later.
      
      Do the new __phys_addr() function (which is now the actual workhorse for
      the unified __pa()/__pa_symbol()) as a real external function, that way
      all the potential issues with compile/link-time optimizations of
      constant symbol addresses go away, and we can also, if we choose to, add
      more sanity-checking of the argument.
      
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Cc: Vivek Goyal <vgoyal@in.ibm.com>
      Cc: Andi Kleen <ak@suse.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e3ebadd9
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · 15700770
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits)
        kconfig: fix mconf segmentation fault
        kbuild: enable use of code from a different dir
        kconfig: error out if recursive dependencies are found
        kbuild: scripts/basic/fixdep segfault on pathological string-o-death
        kconfig: correct minor typo in Kconfig warning message.
        kconfig: fix path to modules.txt in Kconfig help
        usr/Kconfig: fix typo
        kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs'
        kbuild: be more explicit on missing .config file
        kbuild: clarify the creation of the LOCALVERSION_AUTO string.
        kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
        kconfig: refer to qt3 if we cannot find qt libraries
        kbuild: handle compressed cpio initramfs-es
        kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text
        kbuild: remove stale comment in modpost.c
        kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE
        kbuild: fix make mrproper for Documentation/DocBook/man
        kbuild: remove kconfig binaries during make mrproper
        kconfig/menuconfig: do not hardcode '.config'
        kbuild: override build timestamp & version
        ...
      15700770
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm · 6de410c2
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (66 commits)
        KVM: Remove unused 'instruction_length'
        KVM: Don't require explicit indication of completion of mmio or pio
        KVM: Remove extraneous guest entry on mmio read
        KVM: SVM: Only save/restore MSRs when needed
        KVM: fix an if() condition
        KVM: VMX: Add lazy FPU support for VT
        KVM: VMX: Properly shadow the CR0 register in the vcpu struct
        KVM: Don't complain about cpu erratum AA15
        KVM: Lazy FPU support for SVM
        KVM: Allow passing 64-bit values to the emulated read/write API
        KVM: Per-vcpu statistics
        KVM: VMX: Avoid unnecessary vcpu_load()/vcpu_put() cycles
        KVM: MMU: Avoid heavy ASSERT at non debug mode.
        KVM: VMX: Only save/restore MSR_K6_STAR if necessary
        KVM: Fold drivers/kvm/kvm_vmx.h into drivers/kvm/vmx.c
        KVM: VMX: Don't switch 64-bit msrs for 32-bit guests
        KVM: VMX: Reduce unnecessary saving of host msrs
        KVM: Handle guest page faults when emulating mmio
        KVM: SVM: Report hardware exit reason to userspace instead of dmesg
        KVM: Retry sleeping allocation if atomic allocation fails
        ...
      6de410c2
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · c6799ade
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (82 commits)
        [ARM] Add comments marking in-use ptrace numbers
        [ARM] Move syscall saving out of the way of utrace
        [ARM] 4360/1: S3C24XX: regs-udc.h remove unused macro
        [ARM] 4358/1: S3C24XX: mach-qt2410.c: remove linux/mmc/protocol.h header
        [ARM] mm 10: allow memory type to be specified with ioremap
        [ARM] mm 9: add additional device memory types
        [ARM] mm 8: define mem_types table L1 bit 4 to be for ARMv6
        [ARM] iop: add missing parens in macro
        [ARM] mm 7: remove duplicated __ioremap() prototypes
        ARM: OMAP: fix OMAP1 mpuio suspend/resume oops
        ARM: OMAP: MPUIO wake updates
        ARM: OMAP: speed up gpio irq handling
        ARM: OMAP: plat-omap changes for 2430 SDP
        ARM: OMAP: gpio object shrinkage, cleanup
        ARM: OMAP: /sys/kernel/debug/omap_gpio
        ARM: OMAP: Implement workaround for GPIO wakeup bug in OMAP2420 silicon
        ARM: OMAP: Enable 24xx GPIO autoidling
        [ARM] 4318/2: DSM-G600 Board Support
        [ARM] 4227/1: minor head.S fixups
        [ARM] 4328/1: Move i.MX UART regs to driver
        ...
      c6799ade
    • R
      Merge branch 'ixp4xx' into devel · 5cd47155
      Russell King 提交于
      Conflicts:
      
      	include/asm-arm/arch-ixp4xx/io.h
      5cd47155
    • R
      Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx',... · 6f95416e
      Russell King 提交于
      Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx', 'ns9xxx', 'omap', 'pxa', 'rpc', 's3c' and 'sa1100' into devel
      6f95416e
  3. 06 5月, 2007 22 次提交