Eric Lee / smarc-fsl-linux-kernel

19 May, 2008

11 commits

18 May, 2008

14 commits

  • 29e92f483   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
    [ARM] pxa: spitz wants PXA27x UDC definitions
    [ARM] pxa: fix pxafb build when cpufreq is enabled
    [ARM] fix parenthesis in include/asm-arm/arch-omap/control.h
    [ARM] colibri: fix support for DM9000 ethernet device
    [ARM] arm/kernel/arthur.c: add MODULE_LICENSE
    [ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation
    [ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode
    [ARM] export copy_page
    [ARM] 5026/1: locomo: add .settype for gpio and several small fixes
    ARM: OMAP: Fixed comments on global PRM register usage
    ARM: OMAP: Add PARENT_CONTROLS_CLOCK flag to dpll5_m2_ck
    ARM: OMAP: PRCM fixes to ssi clock handling
    ARM: OMAP: Add fuctional clock enabler for iva2
    ARM: OMAP: Fix 34xx to use correct shift values for gpio2-6 fclks
    ARM: OMAP: Keymap fix for palmte and palmz71
    ARM: OMAP: Fix Unbalanced enable for IRQ in omap mailbox
    ARM: OMAP: DMA: Fix incorrect channel linking
    ARM: OMAP: Warn on disabling clocks with no users
    ARM: OMAP: Add calls to omap2_set_globals_*()
    ARM: OMAP: Update MMC header to fix compile

    Linus Torvalds
     
  • dfb0ae091   Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 Browse Code »
    Russell King
     
  • 1da780784   Merge branch 'sa1100' Browse Code »
    Russell King
     
  • 53491e042   [ARM] pxa: spitz wants PXA27x UDC definitions ... Browse Code »

    ... so include the header file.

    Signed-off-by: Russell King

    Russell King
     
  • d0afc85f1   [ARM] colibri: fix support for DM9000 ethernet device ... Browse Code »

    Two changes are necessary to enable proper operation of the DM9000 device with
    the Colibri PXA 270 board: firstly, the IRQ type needs to be configured for
    rising edge interrupts, and secondly this configuration needs to be
    communicated through to the DM9000.

    [akpm@linux-foundation.org: remove set_irq_type() call as per ben-linux request]
    Signed-off-by: Michael Abbott
    Cc: Daniel Mack
    Cc: Jeff Garzik
    Cc: Ben Dooks
    Signed-off-by: Andrew Morton
    Signed-off-by: Russell King

    Michael Abbott
     
  • 7cc09c248   [ARM] arm/kernel/arthur.c: add MODULE_LICENSE ... Browse Code »

    This patch adds the missing MODULE_LICENSE("GPL").

    Signed-off-by: Adrian Bunk
    Signed-off-by: Russell King

    Adrian Bunk
     
  • bbdf1c1e5   [ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation ... Browse Code »

    Whereas most Orion 5x machine support code would initialise the PCI
    subsystem with nr_controllers in their struct hw_pci set to 2, the
    DNS323 and Kurobox Pro machine support code had nr_controllers set
    to 1.

    This was presumably done because on those two machines, the PCI(-X)
    controller (nr == 1) isn't used, requiring initialisation of only
    the PCIe controller (nr == 0.) However, not initialising the PCI(-X)
    controller on boards that don't use it leads to a situation where
    both the PCIe and the PCI(-X) controller think that their root bus is
    zero, and it messes up IRQ assignment.

    This patch changes the DNS323 and Kurobox Pro support code to always
    use nr_controllers == 2.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Russell King

    Lennert Buytenhek
     
  • b3a8b751c   [ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode ... Browse Code »

    The CPU's dma_flush_range() operation needs to clean+invalidate the
    given memory area if the cache is in writeback mode, or do just the
    invalidate part if the cache is in writethrough mode, but the current
    proc-arm{925,926,940,946} (incorrectly) do a cache clean in the
    latter case. This patch fixes that.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Russell King

    Lennert Buytenhek
     
  • db2c43929   [ARM] export copy_page ... Browse Code »

    Martin Michlmayr reported that fuse complains:
    ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!

    so export the needed function.

    Signed-off-by: Russell King

    Russell King
     
  • 2a52efb2c   [ARM] 5026/1: locomo: add .settype for gpio and several small fixes ... Browse Code »

    irqs.h:
    * rename IRQ_LOCOMO_SPI_OVRN to IRQ_LOCOMO_SPI_REND
    locomo.h:
    * add some definition for locomo spi controller
    * correct some errors
    locomo.c:
    * correct some errors
    * add set_type for locomo gpio irq chip

    Signed-off-by: Thomas Kunze
    Signed-off-by: Russell King

    Thomas Kunze
     
  • 08c18964a   Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/… ... Browse Code »

    …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: disable mwait for AMD family 10H/11H CPUs
    x86: fix crash on cpu hotplug on pat-incapable machines
    x86: remove mwait capability C-state check

    Linus Torvalds
     
  • e9623b355   x86: disable mwait for AMD family 10H/11H CPUs ... Browse Code »

    The previous revert of 0c07ee38c9d4eb081758f5ad14bbffa7197e1aec left
    out the mwait disable condition for AMD family 10H/11H CPUs.

    Andreas Herrman said:

    It depends on the CPU. For AMD CPUs that support MWAIT this is wrong.
    Family 0x10 and 0x11 CPUs will enter C1 on HLT. Powersavings then
    depend on a clock divisor and current Pstate of the core.

    If all cores of a processor are in halt state (C1) the processor can
    enter the C1E (C1 enhanced) state. If mwait is used this will never
    happen.

    Thus HLT saves more power than MWAIT here.

    It might be best to switch off the mwait flag for these AMD CPU
    families like it was introduced with commit
    f039b754714a422959027cb18bb33760eb8153f0 (x86: Don't use MWAIT on AMD
    Family 10)

    Re-add the AMD families 10H/11H check and disable the mwait usage for
    those.

    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • 31f4d870b   x86: fix crash on cpu hotplug on pat-incapable machines ... Browse Code »

    pat_disable() is __init, which means it goes away after booting is complete.
    Unfortunately it is used by the hotplug code if the machine is not
    pat-capable, causing a crash.

    Fix by marking pat_disable() as __cpuinit.

    Signed-off-by: Avi Kivity
    Signed-off-by: Ingo Molnar

    Avi Kivity
     
  • a738d897b   x86: remove mwait capability C-state check ... Browse Code »

    Vegard Nossum reports:

    | powertop shows between 200-400 wakeups/second with the description
    | ": Rescheduling interrupts" when all processors have load (e.g.
    | I need to run two busy-loops on my 2-CPU system for this to show up).
    |
    | The bisect resulted in this commit:
    |
    | commit 0c07ee38c9d4eb081758f5ad14bbffa7197e1aec
    | Date: Wed Jan 30 13:33:16 2008 +0100
    |
    | x86: use the correct cpuid method to detect MWAIT support for C states

    remove the functional effects of this patch and make mwait unconditional.

    A future patch will turn off mwait on specific CPUs where that causes
    power to be wasted.

    Bisected-by: Vegard Nossum
    Tested-by: Vegard Nossum
    Signed-off-by: Ingo Molnar

    Ingo Molnar
     

17 May, 2008

2 commits

16 May, 2008

5 commits

  • f26a39889   Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc ... Browse Code »

    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
    [POWERPC] macintosh: Replace deprecated __initcall with device_initcall
    [POWERPC] cell: Fix section mismatches in io-workarounds code
    [POWERPC] spufs: Fix compile error
    [POWERPC] Fix uninitialized variable bug in copy_{to|from}_user
    [POWERPC] Add null pointer check to of_find_property
    [POWERPC] vmemmap fixes to use smaller pages
    [POWERPC] spufs: Fix pointer reference in find_victim
    [POWERPC] 85xx: SBC8548 - Add flash support and HW Rev reporting
    [POWERPC] 85xx: Fix some sparse warnings for 85xx MDS
    [POWERPC] 83xx: Enable DMA engine on the MPC8377 MDS board.
    [POWERPC] 86xx: mpc8610_hpcd: fix second serial port
    [POWERPC] 86xx: mpc8610_hpcd: add support for NOR and NAND flashes
    [POWERPC] 85xx: Add 8568 PHY workarounds to board code
    [POWERPC] 86xx: mpc8610_hpcd: use ULI526X driver for on-board ethernet

    Linus Torvalds
     
  • 7371fd11a   Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 ... Browse Code »

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] fix personality(PER_LINUX32) performance issue
    [IA64] Properly unregister legacy interrupts
    [IA64] Remove NULL pointer check for argument never passed as NULL.
    [IA64] trivial cleanup for perfmon.c
    [IA64] trivial cleanup for entry.S
    [IA64] fix interrupt masking for pending works on kernel leave
    [IA64] allow user to force_pal_cache_flush
    [IA64] Don't reserve crashkernel memory > 4 GB
    [IA64] machvec support for SGI UV platform
    [IA64] Add header files for SGI UV platform

    Linus Torvalds
     
  • 839052d27   [IA64] fix personality(PER_LINUX32) performance issue ... Browse Code »

    The patch aims to fix a performance issue for the syscall
    personality(PER_LINUX32).

    On IA-64 box, the syscall personality (PER_LINUX32) has poor performance
    because it failed to find the Linux/x86 execution domain. Then it tried
    to load the kernel module however it failed always and it used the default
    execution domain PER_LINUX instead. Requesting kernel modules is very
    expensive. It caused the performance issue. (see the function
    lookup_exec_domain in kernel/exec_domain.c).

    To resolve the issue, execution domain Linux/x86 is always registered in
    initialization time for IA-64 architecture.

    Signed-off-by: Xiaolan Huang
    Signed-off-by: Tony Luck

    Huang, Xiaolan
     
  • 8568dae21   Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 ... Browse Code »

    * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
    [S390] show_interrupts: prevent cpu hotplug when walking cpu_online_map.
    [S390] smp: __smp_call_function_map vs cpu_online_map fix.
    [S390] tape: Use ccw_dev_id to build cdev_id.
    [S390] dasd: fix timeout handling in interrupt handler
    [S390] s390dbf: Use const char * for dbf name.
    [S390] dasd: Use const in busid functions.
    [S390] blacklist.c: removed duplicated include
    [S390] vmlogrdr: module initialization function should return negative errors
    [S390] sparsemem vmemmap: initialize memmap.
    [S390] Remove last traces of cio_msg=.
    [S390] cio: Remove CCW_CMD_SUSPEND_RECONN in front of CCW_CMD_SET_PGID.

    Linus Torvalds
     
  • 713c0515a   Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
    arch/parisc/kernel/perf_asm.S: build fix
    parisc: remove -traditional from assembler flags
    parisc: use conditional macro for 64-bit wide ops
    parisc: Remove ioctl.h content picked up from .
    arch/parisc/kernel/unaligned.c: use time_* macros
    parisc: remove redundant display of free swap space in show_mem()
    drivers/parisc: replace remaining __FUNCTION__ occurrences
    parisc: replace remaining __FUNCTION__ occurrences
    parisc: new termios definitions
    parisc: fix trivial section name warnings

    Linus Torvalds
     

15 May, 2008

8 commits