Skip to content
Commits on Jul 4, 2011
  1. Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kerne…

    committed Jul 4, 2011
    …l/git/arm/linux-2.6-arm-soc
    
    * 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc:
      AT91: Change nand buswidth logic to match hardware default configuration
      at91: Use "pclk" as con_id on at91cap9 and at91rm9200
      at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
      atmel_serial: fix internal port num
      at91: fix at91_set_serial_console: use platform device id
  2. @noglitch @arndb

    AT91: Change nand buswidth logic to match hardware default configuration

    noglitch committed with arndb Jul 1, 2011
    The recently modified nand buswitth configuration is not aligned with
    board reality: the double footprint on boards is always populated with 8bits
    buswidth nand flashes.
    So we have to consider that without particular configuration the 8bits
    buswidth is selected by default.
    Moreover, the previous logic was always using !board_have_nand_8bit(), we
    change it to a simpler: board_have_nand_16bit().
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Commits on Jul 1, 2011
  1. Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux…

    committed Jul 1, 2011
    …/kernel/git/konrad/xen
    
    * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/pci: Use the INT_SRC_OVR IRQ (instead of GSI) to preset the ACPI SCI IRQ.
      xen/mmu: Fix for linker errors when CONFIG_SMP is not defined.
Commits on Jun 30, 2011
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    committed Jun 30, 2011
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      watchdog: update author email for at32ap700x_wdt
      watchdog: gef_wdt: fix MODULE_ALIAS
      watchdog: Intel SCU Watchdog: Fix build and remove duplicate code
      watchdog: mtx1-wdt: fix section mismatch
      watchdog: mtx1-wdt: fix GPIO toggling
      watchdog: mtx1-wdt: request gpio before using it
      watchdog: Handle multiple wm831x watchdogs being registered
  2. Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/lin…

    committed Jun 30, 2011
    …ux/kernel/git/lethal/sh-3.x
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
      sh: use printk_ratelimited instead of printk_ratelimit
      sh: Fix up unmet dependency warnings with USB EHCI/OHCI selects.
      sh: fix the value of sh_dmae_slave_config in setup-sh7757
      sh: fix the INTC vector for IRQ and IRL in setup-sh7757
      sh: add to select the new configuration for USB EHCI/OHCI
      sh: add platform_device of EHCI/OHCI to setup-sh7757
      sh: fix compile error using sh7757lcr_defconfig
  3. Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/sc…

    committed Jun 30, 2011
    …m/linux/kernel/git/lethal/sh-3.x
    
    * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
      ARM: mach-shmobile: make a struct in board-ap4evb.c static
      ARM: mach-shmobile: ag5evm: consistently name sdhi info structures
      ARM: mach-shmobile: mackerel: change usbhs devices order
  4. xen/pci: Use the INT_SRC_OVR IRQ (instead of GSI) to preset the ACPI …

    Konrad Rzeszutek Wilk committed Jun 30, 2011
    …SCI IRQ.
    
    In the past we would use the GSI value to preset the ACPI SCI
    IRQ which worked great as GSI == IRQ:
    
    ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 low level)
    
    While that is most often seen, there are some oddities:
    
    ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 20 low level)
    
    which means that GSI 20 (or pin 20) is to be overriden for IRQ 9.
    Our code that presets the interrupt for ACPI SCI however would
    use the GSI 20 instead of IRQ 9 ending up with:
    
    xen: sci override: global_irq=20 trigger=0 polarity=1
    xen: registering gsi 20 triggering 0 polarity 1
    xen: --> pirq=20 -> irq=20
    xen: acpi sci 20
    .. snip..
    calling  acpi_init+0x0/0xbc @ 1
    ACPI: SCI (IRQ9) allocation failed
    ACPI Exception: AE_NOT_ACQUIRED, Unable to install System Control Interrupt handler (20110413/evevent-119)
    ACPI: Unable to start the ACPI Interpreter
    
    as the ACPI interpreter made a call to 'acpi_gsi_to_irq' which got nine.
    It used that value to request an IRQ (request_irq) and since that was not
    present it failed.
    
    The fix is to recognize that for interrupts that are overriden (in our
    case we only care about the ACPI SCI) we should use the IRQ number
    to present the IRQ instead of the using GSI. End result is that we get:
    
    xen: sci override: global_irq=20 trigger=0 polarity=1
    xen: registering gsi 20 triggering 0 polarity 1
    xen: --> pirq=20 -> irq=9 (gsi=9)
    xen: acpi sci 9
    
    which fixes the ACPI interpreter failing on startup.
    
    CC: stable@kernel.org
    Reported-by: Liwei <xieliwei@gmail.com>
    Tested-by: Liwei <xieliwei@gmail.com>
    [http://lists.xensource.com/archives/html/xen-devel/2011-06/msg01727.html]
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  5. xen/mmu: Fix for linker errors when CONFIG_SMP is not defined.

    Konrad Rzeszutek Wilk committed Jun 30, 2011
    Simple enough - we use an extern defined symbol which is not
    defined when CONFIG_SMP is not defined. This fixes the linker
    dying.
    
    CC: stable@kernel.org
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  6. sh: use printk_ratelimited instead of printk_ratelimit

    Paul Mundt committed Jun 30, 2011
    Follows the powerpc change, for much the same rationale.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  7. sh: Fix up unmet dependency warnings with USB EHCI/OHCI selects.

    Paul Mundt committed Jun 30, 2011
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  8. @lyakh

    ARM: mach-shmobile: make a struct in board-ap4evb.c static

    lyakh committed with Paul Mundt Jun 29, 2011
    struct soc_camera_link imx074_link in board-ap4evb.c doesn't have
    to be global.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Commits on Jun 29, 2011
  1. Merge branch 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/k…

    committed Jun 29, 2011
    …vm/kvm
    
    * 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: x86 emulator: fix %rip-relative addressing with immediate source operand
  2. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    committed Jun 29, 2011
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      arch/powerpc: use printk_ratelimited instead of printk_ratelimit
      powerpc/rtas-rtc: remove sideeffects of printk_ratelimit
      powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig
      powerpc/e500: fix breakage with fsl_rio_mcheck_exception
      powerpc/p1022ds: fix audio-related properties in the device tree
      powerpc/85xx: fix NAND_CMD_READID read bytes number
  3. sh: fix the value of sh_dmae_slave_config in setup-sh7757

    Yoshihiro Shimoda committed with Paul Mundt Jun 29, 2011
    Fix the value of chcr for SCIF[2-4]_RX and RIIC[0-9]_RX and
    the value of mid_rid for some RIIC.
    
    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  4. sh: fix the INTC vector for IRQ and IRL in setup-sh7757

    Yoshihiro Shimoda committed with Paul Mundt Jun 29, 2011
    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  5. KVM: x86 emulator: fix %rip-relative addressing with immediate source…

    Avi Kivity committed Jun 19, 2011
    … operand
    
    %rip-relative addressing is relative to the first byte of the next instruction,
    so we need to add %rip only after we've fetched any immediate bytes.
    
    Based on original patch by Li Xin <xin.li@intel.com>.
    
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Acked-by: Li Xin <xin.li@intel.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  6. @stettberger @ozbenh

    arch/powerpc: use printk_ratelimited instead of printk_ratelimit

    stettberger committed with ozbenh Jun 4, 2011
    Since printk_ratelimit() shouldn't be used anymore (see comment in
    include/linux/printk.h), replace it with printk_ratelimited.
    
    Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  7. @stettberger @ozbenh

    powerpc/rtas-rtc: remove sideeffects of printk_ratelimit

    stettberger committed with ozbenh Jun 4, 2011
    Don't use printk_ratelimit() as an additional condition for returning
    on an error. Because when the ratelimit is reached, printk_ratelimit
    will return 0 and e.g. in rtas_get_boot_time won't check for an error
    condition.
    
    Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Commits on Jun 28, 2011
  1. @mikey @ozbenh

    powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig

    mikey committed with ozbenh Jun 27, 2011
    Remove duplicate assignment of SCSI_BNX2_ISCSI in pseries_defconfig
    introduced by:
      37e0c21 powerpc/pseries: Enable iSCSI support for a number of cards
    
    causes warning:
    arch/powerpc/configs/pseries_defconfig:151:warning: override: reassigning to symbol SCSI_BNX2_ISCSI
    
    Signed-off-by: Michael Neuling <mikey@neuling.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  2. Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    committed Jun 28, 2011
    …/git/gregkh/tty-2.6
    
    * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      serial: bcm63xx_uart: fix irq storm after rx fifo overrun.
      amba pl011: platform data for reg lockup and glitch v2
      amba pl011: workaround for uart registers lockup
      tty: n_gsm: improper skb_pull() use was leaking framed data
      tty: n_gsm: Fixed logic to decode break signal from modem status
      TTY: ntty, add one more sanity check
      TTY: ldisc, do not close until there are readers
      8250: Fix capabilities when changing the port type
      8250_pci: Fix missing const from merges
      ARM: SAMSUNG: serial: Fix on handling of one clock source for UART
      serial: ioremap warning fix for jsm driver.
      8250_pci: add -ENODEV code for Intel EG20T PCH
  3. @jjuhl

    watchdog: Intel SCU Watchdog: Fix build and remove duplicate code

    jjuhl committed with Wim Van Sebroeck May 26, 2011
    Trying to build the Intel SCU Watchdog fails for me with gcc 4.6.0 -
    $ gcc --version | head -n 1
    gcc (GCC) 4.6.0 20110513 (prerelease)
    
    like this :
      CC      drivers/watchdog/intel_scu_watchdog.o
    In file included from drivers/watchdog/intel_scu_watchdog.c:49:0:
    /home/jj/src/linux-2.6/arch/x86/include/asm/apb_timer.h: In function ‘apbt_time_init’:
    /home/jj/src/linux-2.6/arch/x86/include/asm/apb_timer.h:65:42: warning: ‘return’ with a value, in function returning void [enabled by default]
    drivers/watchdog/intel_scu_watchdog.c: In function ‘intel_scu_watchdog_init’:
    drivers/watchdog/intel_scu_watchdog.c:468:2: error: implicit declaration of function ‘sfi_get_mtmr’ [-Werror=implicit-function-declaration]
    drivers/watchdog/intel_scu_watchdog.c:468:32: warning: assignment makes pointer from integer without a cast [enabled by default]
    cc1: some warnings being treated as errors
    
    make[1]: *** [drivers/watchdog/intel_scu_watchdog.o] Error 1
    make: *** [drivers/watchdog/intel_scu_watchdog.o] Error 2
    
    Additionally, linux/types.h is needlessly being included twice in 
    drivers/watchdog/intel_scu_watchdog.c
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  4. @richardweinberger

    um: add asm/percpu.h

    richardweinberger committed with Jun 27, 2011
    To make SLUB work on UML we need this_cpu_cmpxchg from
    asm-generic/percpu.h.
    
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jun 27, 2011
  1. @hkamezawa

    Fix node_start/end_pfn() definition for mm/page_cgroup.c

    hkamezawa committed with Jun 16, 2011
    commit 21a3c96 uses node_start/end_pfn(nid) for detection start/end
    of nodes. But, it's not defined in linux/mmzone.h but defined in
    /arch/???/include/mmzone.h which is included only under
    CONFIG_NEED_MULTIPLE_NODES=y.
    
    Then, we see
      mm/page_cgroup.c: In function 'page_cgroup_init':
      mm/page_cgroup.c:308: error: implicit declaration of function 'node_start_pfn'
      mm/page_cgroup.c:309: error: implicit declaration of function 'node_end_pfn'
    
    So, fixiing page_cgroup.c is an idea...
    
    But node_start_pfn()/node_end_pfn() is a very generic macro and
    should be implemented in the same manner for all archs.
    (m32r has different implementation...)
    
    This patch removes definitions of node_start/end_pfn() in each archs
    and defines a unified one in linux/mmzone.h. It's not under
    CONFIG_NEED_MULTIPLE_NODES, now.
    
    A result of macro expansion is here (mm/page_cgroup.c)
    
    for !NUMA
     start_pfn = ((&contig_page_data)->node_start_pfn);
      end_pfn = ({ pg_data_t *__pgdat = (&contig_page_data); __pgdat->node_start_pfn + __pgdat->node_spanned_pages;});
    
    for NUMA (x86-64)
      start_pfn = ((node_data[nid])->node_start_pfn);
      end_pfn = ({ pg_data_t *__pgdat = (node_data[nid]); __pgdat->node_start_pfn + __pgdat->node_spanned_pages;});
    
    Changelog:
     - fixed to avoid using "nid" twice in node_end_pfn() macro.
    
    Reported-and-acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    Reported-and-tested-by: Ingo Molnar <mingo@elte.hu>
    Acked-by: Mel Gorman <mgorman@suse.de>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

    committed Jun 27, 2011
    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: pm: ensure ARMv7 CPUs save and restore the TLS register
      ARM: pm: proc-v7: fix missing struct processor pointers for suspend code
      ARM: 6969/1: plat-iop: fix build error
      ARM: 6961/1: zImage: Add build-time check for correctly-sized proc_type entries
      ARM: SMP: wait for CPU to be marked active
      ARM: 6963/1: Thumb-2: Relax relocation requirements for non-function symbols
      ARM: 6962/1: mach-h720x: fix build error
      ARM: 6959/1: SMP build fix for entry-macro-multi.S
  3. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    committed Jun 27, 2011
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] allow setting of upper 32 bit in smp_ctl_set_bit
      [S390] hwsampler: Set a sane default sampling rate
      [S390] s390: enforce HW limits for the initial sampling rate
      [S390] kvm-s390: fix kconfig dependencies
Commits on Jun 25, 2011
  1. @manabian @plagnioj

    at91: Use "pclk" as con_id on at91cap9 and at91rm9200

    manabian committed with plagnioj Jun 2, 2011
    Hello,
    
    I am not 100% sure this is the right thing to do, but it makes the
    atmel-ssc driver happy on my at91rm9200 board.
    
    This unifies the con_id across all at91 machines.
    
    The atmel-ssc driver expects the con_id to be "pclk" or it will fail probing.
    
    Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com>
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  2. @plagnioj

    at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl

    plagnioj committed Jun 21, 2011
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
    Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
  3. @plagnioj

    at91: fix at91_set_serial_console: use platform device id

    plagnioj committed Jun 21, 2011
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Commits on Jun 24, 2011
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    committed Jun 24, 2011
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      x86/PCI/ACPI: fix type mismatch
      PCI: fix new kernel-doc warning
      PCI: Fix warning in drivers/pci/probe.c on sparc64
  2. sh: add to select the new configuration for USB EHCI/OHCI

    Yoshihiro Shimoda committed with Paul Mundt Mar 1, 2011
    Because the USB EHCI/OHCI driver has new configuration for SH,
    the patch enables the EHCI and/or OHCI driver of the on-chip for
    some CPUs.
    
    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  3. ARM: pm: ensure ARMv7 CPUs save and restore the TLS register

    Russell King committed Jun 22, 2011
    Ensure that the TLS register is saved and restored over a suspend
    cycle, so that userspace programs don't see a corrupted TLS value.
    
    Tested-by: Kevin Hilman <khilman@ti.com>
    Acked-by: Jean Pihet <j-pihet@ti.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  4. ARM: pm: proc-v7: fix missing struct processor pointers for suspend code

    Russell King committed Jun 23, 2011
    Add the missing suspend/resume pointers for the suspend code.  This
    is needed when building for multiple CPUs.
    
    Tested-by: Kevin Hilman <khilman@ti.com>
    Acked-by: Jean Pihet <j-pihet@ti.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Commits on Jun 22, 2011
  1. [S390] allow setting of upper 32 bit in smp_ctl_set_bit

    Jan Glauber committed with Martin Schwidefsky Jun 22, 2011
    The bit shift operation in smp_ctl_set_bit does not specify the type
    of the shifted bit so integer is used as default. Therefore it is not
    possible to set bits in the upper 32 bit of the control register if
    the kernel runs in 64 bit mode. Fix this by specifying the type as
    unsigned long.
    
    Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  2. @borntraeger

    [S390] hwsampler: Set a sane default sampling rate

    borntraeger committed with Martin Schwidefsky Jun 22, 2011
    The sampling interval for the hardware sampler is specified in cycles.
    (see SA23-2260-01 The Load-Program-Parameter and the CPU-Measurement
    Facilities)
    The current default value will therefore result in millions of samples.
    This patch changes the default sampling interval to 4M, which will
    result in ~1500 samples per second on a z196 reducing the overhead
    of sampling.
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  3. @borntraeger

    [S390] s390: enforce HW limits for the initial sampling rate

    borntraeger committed with Martin Schwidefsky Jun 22, 2011
    On specific configurations with hwsampler opcontrol --start returns an
    error on "echo 1 >/dev/oprofile/enable". Turns out that the hw sampling
    interval is not checked against the hardware limits.
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Something went wrong with that request. Please try again.