1. 26 5月, 2011 2 次提交
    • M
      x86, efi: Retain boot service code until after switching to virtual mode · 916f676f
      Matthew Garrett 提交于
      UEFI stands for "Unified Extensible Firmware Interface", where "Firmware"
      is an ancient African word meaning "Why do something right when you can
      do it so wrong that children will weep and brave adults will cower before
      you", and "UEI" is Celtic for "We missed DOS so we burned it into your
      ROMs". The UEFI specification provides for runtime services (ie, another
      way for the operating system to be forced to depend on the firmware) and
      we rely on these for certain trivial tasks such as setting up the
      bootloader. But some hardware fails to work if we attempt to use these
      runtime services from physical mode, and so we have to switch into virtual
      mode. So far so dreadful.
      
      The specification makes it clear that the operating system is free to do
      whatever it wants with boot services code after ExitBootServices() has been
      called. SetVirtualAddressMap() can't be called until ExitBootServices() has
      been. So, obviously, a whole bunch of EFI implementations call into boot
      services code when we do that. Since we've been charmingly naive and
      trusted that the specification may be somehow relevant to the real world,
      we've already stuffed a picture of a penguin or something in that address
      space. And just to make things more entertaining, we've also marked it
      non-executable.
      
      This patch allocates the boot services regions during EFI init and makes
      sure that they're executable. Then, after SetVirtualAddressMap(), it
      discards them and everyone lives happily ever after. Except for the ones
      who have to work on EFI, who live sad lives haunted by the knowledge that
      someone's eventually going to write yet another firmware specification.
      
      [ hpa: adding this to urgent with a stable tag since it fixes currently-broken
        hardware.  However, I do not know what the dependencies are and so I do
        not know which -stable versions this may be a candidate for. ]
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      Link: http://lkml.kernel.org/r/1306331593-28715-1-git-send-email-mjg@redhat.comSigned-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      Cc: Tony Luck <tony.luck@intel.com>
      Cc: <stable@kernel.org>
      916f676f
    • N
      x86: Remove unnecessary check in detect_ht() · 8b27f2ff
      Nikhil P Rao 提交于
      This patch removes a check that causes incorrect scheduler
      domain setup (SMP instead of SMT) and bootlog warning messages
      when cpuid extensions for topology enumeration are not supported
      and the number of processors reported to the OS is smaller than
      smp_num_siblings.
      Acked-by: NSuresh Siddha <suresh.b.siddha@intel.com>
      Signed-off-by: NNikhil P Rao <nikhil.rao@intel.com>
      Link: http://lkml.kernel.org/r/1306343921.19325.1.camel@fedora13Signed-off-by: NIngo Molnar <mingo@elte.hu>
      8b27f2ff
  2. 25 5月, 2011 25 次提交
    • R
      x86: Reorder mm_context_t to remove x86_64 alignment padding and thus shrink mm_struct · af6a25f0
      Richard Kennedy 提交于
      Reorder mm_context_t to remove alignment padding on 64 bit
      builds shrinking its size from 64 to 56 bytes.
      
      This allows mm_struct to shrink from 840 to 832 bytes, so using
      one fewer cache lines, and getting more objects per slab when
      using slub.
      
      slabinfo mm_struct reports
      before :-
      
          Sizes (bytes)     Slabs
          -----------------------------------
          Object :     840  Total  :       7
          SlabObj:     896  Full   :       1
          SlabSiz:   16384  Partial:       4
          Loss   :      56  CpuSlab:       2
          Align  :      64  Objects:      18
      
      after :-
      
          Sizes (bytes)     Slabs
          ----------------------------------
          Object :     832  Total  :       7
          SlabObj:     832  Full   :       1
          SlabSiz:   16384  Partial:       4
          Loss   :       0  CpuSlab:       2
          Align  :      64  Objects:      19
      Signed-off-by: NRichard Kennedy <richard@rsk.demon.co.uk>
      Cc: wilsons@start.ca
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Pekka Enberg <penberg@kernel.org>
      Link: http://lkml.kernel.org/r/1306244999.1999.5.camel@castor.rskSigned-off-by: NIngo Molnar <mingo@elte.hu>
      af6a25f0
    • C
      x86, UV: Clean up uv_tlb.c · f073cc8f
      Cliff Wickman 提交于
      SGI UV's uv_tlb.c driver has become rather hard to read, with overly large
      functions, non-standard coding style and (way) too long variable, constant
      and function names and non-obvious code flow sequences.
      
      This patch improves the readability and maintainability of the driver
      significantly, by doing the following strict code cleanups with no side
      effects:
      
       - Split long functions into shorter logical functions.
      
       - Shortened some variable and structure member names.
      
       - Added special functions for reads and writes of MMR regs with
         very long names.
      
       - Added the 'tunables' table to shortened tunables_write().
      
       - Added the 'stat_description' table to shorten uv_ptc_proc_write().
      
       - Pass fewer 'stat' arguments where it can be derived from the 'bcp'
         argument.
      
       - Function definitions consistent on one line, and inline in few (short) cases.
      
       - Moved some small structures and an atomic inline function to the header file.
      
       - Moved some local variables to the blocks where they are used.
      
       - Updated the copyright date.
      
       - Shortened uv_write_global_mmr64() etc. using some aliasing; no
         line breaks. Renamed many uv_.. functions that are not exported.
      
       - Aligned structure fields.
          [ note that not all structures are aligned the same way though; I'd like
            to keep the extensive commenting in some of them. ]
      
       - Shortened some long structure names.
      
       - Standard pass/fail exit from init_per_cpu()
      
       - Vertical alignment for mass initializations.
      
       - More separation between blocks of code.
      
      Tested on a 16-processor Altix UV.
      Signed-off-by: NCliff Wickman <cpw@sgi.com>
      Cc: penberg@kernel.org
      Link: http://lkml.kernel.org/r/E1QOw12-0004MN-Lp@eag09.americas.sgi.comSigned-off-by: NIngo Molnar <mingo@elte.hu>
      f073cc8f
    • J
      x86, UV: Add support for SGI UV2 hub chip · 2a919596
      Jack Steiner 提交于
      This patch adds support for a new version of the SGI UV hub
      chip. The hub chip is the node controller that connects multiple
      blades into a larger coherent SSI.
      
      For the most part, UV2 is compatible with UV1. The majority of
      the changes are in the addresses of MMRs and in a few cases, the
      contents of MMRs. These changes are the result in changes in the
      system topology such as node configuration, processor types,
      maximum nodes, physical address sizes, etc.
      Signed-off-by: NJack Steiner <steiner@sgi.com>
      Link: http://lkml.kernel.org/r/20110511175028.GA18006@sgi.comSigned-off-by: NIngo Molnar <mingo@elte.hu>
      2a919596
    • K
      x86, cpufeature: Update CPU feature RDRND to RDRAND · 7ccafc5f
      Kees Cook 提交于
      The Intel manual changed the name of the CPUID bit to match the
      instruction name. We should follow suit for sanity's sake. (See Intel SDM
      Volume 2, Table 3-20 "Feature Information Returned in the ECX Register".)
      
      [ hpa: we can only do this at this time because there are currently no CPUs
        with this feature on the market, hence this is pre-hardware enabling.
        However, Cc:'ing stable so that stable can present a consistent ABI. ]
      Signed-off-by: NKees Cook <kees.cook@canonical.com>
      Link: http://lkml.kernel.org/r/20110524232926.GA27728@outflux.netSigned-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: <stable@kernel.org> v2.6.36-39
      7ccafc5f
    • L
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 37d8cb54
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c-parport: Various cleanups
        i2c-i801: Don't depend on other kernel driver config options
        i2c-i801: Check for vendor Fujitsu before probing for apanel
        i2c-i801: Don't probe for slaves on IDF channels
        i2c-i801: SMBus patch for Intel Panther Point DeviceIDs
        i2c/writing-clients: Fix foo_driver.id_table
      37d8cb54
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · dc522adb
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        jbd: Fix comment to match the code in journal_start()
        jbd/jbd2: remove obsolete summarise_journal_usage.
        jbd: Fix forever sleeping process in do_get_write_access()
        ext2: fix error msg when mounting fs with too-large blocksize
        jbd: fix fsync() tid wraparound bug
        ext3: Fix fs corruption when make_indexed_dir() fails
        ext3: Fix lock inversion in ext3_symlink()
      dc522adb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · df3256f9
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: make plock operation killable
        dlm: remove shared message stub for recovery
        dlm: delayed reply message warning
        dlm: Remove superfluous call to recalc_sigpending()
      df3256f9
    • L
      Merge branch 'for-linus' of... · b0ca118d
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (43 commits)
        TOMOYO: Fix wrong domainname validation.
        SELINUX: add /sys/fs/selinux mount point to put selinuxfs
        CRED: Fix load_flat_shared_library() to initialise bprm correctly
        SELinux: introduce path_has_perm
        flex_array: allow 0 length elements
        flex_arrays: allow zero length flex arrays
        flex_array: flex_array_prealloc takes a number of elements, not an end
        SELinux: pass last path component in may_create
        SELinux: put name based create rules in a hashtable
        SELinux: generic hashtab entry counter
        SELinux: calculate and print hashtab stats with a generic function
        SELinux: skip filename trans rules if ttype does not match parent dir
        SELinux: rename filename_compute_type argument to *type instead of *con
        SELinux: fix comment to state filename_compute_type takes an objname not a qstr
        SMACK: smack_file_lock can use the struct path
        LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH
        LSM: split LSM_AUDIT_DATA_FS into _PATH and _INODE
        SELINUX: Make selinux cache VFS RCU walks safe
        SECURITY: Move exec_permission RCU checks into security modules
        SELinux: security_read_policy should take a size_t not ssize_t
        ...
      b0ca118d
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 2bb732cd
      Linus Torvalds 提交于
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        kbuild: make KBUILD_NOCMDDEP=1 handle empty built-in.o
        scripts/kallsyms.c: fix potential segfault
        scripts/gen_initramfs_list.sh: Convert to a /bin/sh script
        kbuild: Fix GNU make v3.80 compatibility
        kbuild: Fix passing -Wno-* options to gcc 4.4+
        kbuild: move scripts/basic/docproc.c to scripts/docproc.c
        kbuild: Fix Makefile.asm-generic for um
        kbuild: Allow to combine multiple W= levels
        kbuild: Disable -Wunused-but-set-variable for gcc 4.6.0
        Fix handling of backlash character in LINUX_COMPILE_BY name
        kbuild: asm-generic support
        kbuild: implement several W= levels
        kbuild: Fix build with binutils <= 2.19
        initramfs: Use KBUILD_BUILD_TIMESTAMP for generated entries
        kbuild: Allow to override LINUX_COMPILE_BY and LINUX_COMPILE_HOST macros
        kbuild: Drop unused LINUX_COMPILE_TIME and LINUX_COMPILE_DOMAIN macros
        kbuild: Use the deterministic mode of ar
        kbuild: Call gzip with -n
        kbuild: move KALLSYMS_EXTRA_PASS from Kconfig to Makefile
        Kconfig: improve KALLSYMS_ALL documentation
      
      Fix up trivial conflict in Makefile
      2bb732cd
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · f50d1d9e
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        pcmcia: Make struct pcmcia_device_id const, sound drivers edition
        staging: pcmcia: Convert pcmcia_device_id declarations to const
        pcmcia: Convert pcmcia_device_id declarations to const
        pcmcia: Make declaration and uses of struct pcmcia_device_id const
        pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
      f50d1d9e
    • L
      Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 98b98d31
      Linus Torvalds 提交于
      * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (169 commits)
        drivers/gpu/drm/radeon/atom.c: fix warning
        drm/radeon/kms: bump kms version number
        drm/radeon/kms: properly set num banks for fusion asics
        drm/radeon/kms/atom: move dig phy init out of modesetting
        drm/radeon/kms/cayman: fix typo in register mask
        drm/radeon/kms: fix typo in spread spectrum code
        drm/radeon/kms: fix tile_config value reported to userspace on cayman.
        drm/radeon/kms: fix incorrect comparison in cayman setup code.
        drm/radeon/kms: add wait idle ioctl for eg->cayman
        drm/radeon/cayman: setup hdp to invalidate and flush when asked
        drm/radeon/evergreen/btc/fusion: setup hdp to invalidate and flush when asked
        agp/uninorth: Fix lockups with radeon KMS and >1x.
        drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only
        drm/radeon/kms: properly set the CLK_REF bit for DCE3 devices
        drm/radeon/kms: fixup eDP connector handling
        drm/radeon/kms: bail early for eDP in hotplug callback
        drm/radeon/kms: simplify hotplug handler logic
        drm/radeon/kms: rewrite DP handling
        drm/radeon/kms/atom: add support for setting DP panel mode
        drm/radeon/kms: atombios.h updates for DP panel mode
        ...
      98b98d31
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 0d66cba1
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (29 commits)
        [S390] cpu hotplug: fix external interrupt subclass mask handling
        [S390] oprofile: dont access lowcore
        [S390] oprofile: add missing irq stats counter
        [S390] Ignore sendmmsg system call note wired up warning
        [S390] s390,oprofile: fix compile error for !CONFIG_SMP
        [S390] s390,oprofile: fix alert counter increment
        [S390] Remove unused includes in process.c
        [S390] get CPC image name
        [S390] sclp: event buffer dissection
        [S390] chsc: process channel-path-availability information
        [S390] refactor page table functions for better pgste support
        [S390] merge page_test_dirty and page_clear_dirty
        [S390] qdio: prevent compile warning
        [S390] sclp: remove unnecessary sendmask check
        [S390] convert old cpumask API into new one
        [S390] pfault: cleanup code
        [S390] pfault: cpu hotplug vs missing completion interrupts
        [S390] smp: add __noreturn attribute to cpu_die()
        [S390] percpu: implement arch specific irqsafe_cpu_ops
        [S390] vdso: disable gcov profiling
        ...
      0d66cba1
    • J
      i2c-parport: Various cleanups · 07da0372
      Jean Delvare 提交于
      * Fix white space.
      * Rename labels to something meaningful.
      * Prefix defines with PORT_ to avoid collision with macros from
        <linux/parport.h>.
      * Add const markers where possible.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      07da0372
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4637f40f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
        Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander
        Input: tsc2007 - add X, Y and Z fuzz factors to platform data
        Input: tsc2007 - add poll_period parameter to platform data
        Input: tsc2007 - add poll_delay parameter to platform data
        Input: tsc2007 - add max_rt parameter to platform data
        Input: tsc2007 - debounce pressure measurement
        Input: ad714x - fix captouch wheel option algorithm
        Input: ad714x - allow platform code to specify irqflags
        Input: ad714x - fix threshold and completion interrupt masks
        Input: ad714x - fix up input configuration
        Input: elantech - remove support for proprietary X driver
        Input: elantech - report multitouch with proper ABS_MT messages
        Input: elantech - export pressure and width when supported
        Input: elantech - describe further the protocol
        Input: atmel_tsadcc - correct call to input_free_device
        Input: add driver FSL MPR121 capacitive touch sensor
        Input: remove useless synchronize_rcu() calls
        Input: ads7846 - fix gpio_pendown configuration
        Input: ads7846 - add possibility to use external vref on ads7846
        Input: rotary-encoder - add support for half-period encoders
        ...
      4637f40f
    • J
      i2c-i801: Don't depend on other kernel driver config options · 8eacfceb
      Jean Delvare 提交于
      Don't let other driver config options influence us, as it makes the
      code more complex and fragile for a small benefit. There's nothing
      wrong with instantiating I2C devices even if they don't have a driver.
      And we're talking about 835 extra bytes in the binary on x86-64,
      that's hardly worth arguing about.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Cc: David Woodhouse <david.woodhouse@intel.com>
      Cc: Hans de Goede <hdegoede@redhat.com>
      8eacfceb
    • J
      i2c-i801: Check for vendor Fujitsu before probing for apanel · 6aa1464d
      Jean Delvare 提交于
      Scanning the BIOS memory for the apanel information is costly, so
      avoid doing it on non-Fujitsu machines.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      6aa1464d
    • J
      i2c-i801: Don't probe for slaves on IDF channels · e7198fbf
      Jean Delvare 提交于
      I don't know if Fujitsu is ever going to produce Patsburg-based
      machines, but if they do, I'd rather not probe the secondary (IDF)
      SMBus channels. At least not until we have a good reason for doing so.
      
      On a side note, I'm not even sure if it is right to enable detection
      of HWMON and DDC devices on the IDF channels. Time will tell...
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Acked-by: NHans de Goede <hdegoede@redhat.com>
      Acked-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      e7198fbf
    • S
      i2c-i801: SMBus patch for Intel Panther Point DeviceIDs · 6e2a851e
      Seth Heasley 提交于
      This patch adds the SMBus controller DeviceID for the Intel Panther Point PCH.
      Signed-off-by: NSeth Heasley <seth.heasley@intel.com>
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      6e2a851e
    • V
      i2c/writing-clients: Fix foo_driver.id_table · 3116c860
      Vikram Narayanan 提交于
      The i2c_device_id structure variable's name is not used in the
      i2c_driver structure.
      Signed-off-by: NVikram Narayanan <vikram186@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      3116c860
    • L
      Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 5129df03
      Linus Torvalds 提交于
      * 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: Unify input section names
        percpu: Avoid extra NOP in percpu_cmpxchg16b_double
        percpu: Cast away printk format warning
        percpu: Always align percpu output section to PAGE_SIZE
      
      Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun
      5129df03
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · 4d429480
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: switch to dynamic printks
        UBI: turn some macros into static inline
        UBI: improve checking in debugging prints
        UBI: fix typo in a message
        UBI: fix minor stylistic issues
        UBI: use __packed instead of __attribute__((packed))
        UBI: cleanup comments around volume properties
        UBI: re-name set volume properties ioctl
        UBI: make the control character device non-seekable
      4d429480
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · eb08d8ff
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubifs-2.6: (52 commits)
        UBIFS: switch to dynamic printks
        UBIFS: fix kernel-doc comments
        UBIFS: fix extremely rare mount failure
        UBIFS: simplify LEB recovery function further
        UBIFS: always cleanup the recovered LEB
        UBIFS: clean up LEB recovery function
        UBIFS: fix-up free space on mount if flag is set
        UBIFS: add the fixup function
        UBIFS: add a superblock flag for free space fix-up
        UBIFS: share the next_log_lnum helper
        UBIFS: expect corruption only in last journal head LEBs
        UBIFS: synchronize write-buffer before switching to the next bud
        UBIFS: remove BUG statement
        UBIFS: change bud replay function conventions
        UBIFS: substitute the replay tree with a replay list
        UBIFS: simplify replay
        UBIFS: store free and dirty space in the bud replay entry
        UBIFS: remove unnecessary stack variable
        UBIFS: double check that buds are replied in order
        UBIFS: make 2 functions static
        ...
      eb08d8ff
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 9f22aae0
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (22 commits)
        m68knommu: Use generic show_interrupts()
        coldfire_qspi compile fix
        m68k: merge the mmu and non-mmu versions of sys_m68k.c
        m68knommu: use asm-generic/bitops/ext2-atomic.h
        m68knommu: Remove obsolete #include <linux/sys.h>
        m68k: merge mmu and non-mmu versions of asm-offsets.c
        m68k: merge non-mmu and mmu versions of m68k_ksyms.c
        m68knommu: remove un-needed exporting of COLDFIRE symbols
        m68knommu: move EXPORT of kernel_thread to function definition
        m68knommu: move EXPORT of local checksumming functions to definitions
        m68knommu: move EXPORT of dump_fpu to function definition
        m68knommu: clean up mm/init_no.c
        m68k: merge the mmu and non-mmu mm/Makefile
        m68k: mv kmap_mm.c to kmap.c
        m68knommu: remove stubs for __ioremap() and iounmap()
        m68knommu: remove unused kernel_set_cachemode()
        m68k: let Makefile sort out compiling mmu and non-mmu lib/checksum.c
        m68k: remove duplicate memcpy() implementation
        m68k: remove duplicate memset() implementation
        m68k: remove duplicate memmove() implementation
        ...
      9f22aae0
    • L
      Merge branch 'x86-urgent-for-linus' of... · 988c7f2d
      Linus Torvalds 提交于
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, ioapic: Restore ioapic entries during resume properly
        x86: Get rid of asmregparm
        um: Use RWSEM_GENERIC_SPINLOCK on x86
      988c7f2d
    • S
      x86, ioapic: Restore ioapic entries during resume properly · 2f344d2e
      Suresh Siddha 提交于
      In mask/restore_ioapic_entries() we should be restoring ioapic
      entries when ioapics[apic].saved_registers is not NULL.
      
      Fix the typo and address the resume hang regression reported by
      Linus.
      
      This was not found sooner because the systems where these
      changes were tested on kept the IO-APIC entries intact over
      resume.
      Reported-and-tested-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NSuresh Siddha <suresh.b.siddha@intel.com>
      Cc: Daniel J Blueman <daniel.blueman@gmail.com>
      Link: http://lkml.kernel.org/r/1306259131.7171.7.camel@sbsiddha-MOBL3.sc.intel.comSigned-off-by: NIngo Molnar <mingo@elte.hu>
      2f344d2e
  3. 24 5月, 2011 13 次提交