Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v3.2-rc2 2011-11-15T16:47:28Z 2011-11-15T16:47:28Z Linus Torvalds torvalds@linux-foundation.org 2011-11-15T16:47:28Z urn:sha1:642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: fsl-rio: fix compile error 2011-11-14T17:43:17Z Liu Gang Gang.Liu@freescale.com 2011-11-11T13:48:28Z urn:sha1:e0ce42e19ce1978a5aee33b2954d7e1a730e88c4 The "#include <linux/module.h>" was replaced by "#include <linux/export.h>" in the patch "powerpc: various straight conversions from module.h --> export.h". This will cause the following compile problem: arch/powerpc/sysdev/fsl_rio.c: In function 'fsl_rio_mcheck_exception': arch/powerpc/sysdev/fsl_rio.c:296: error: implicit declaration of function 'search_exception_tables'. The file fsl_rio.c needs the declaration of function "search_exception_tables" in the header file "linux/module.h". Signed-off-by: Liu Gang <Gang.Liu@freescale.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> 2011-11-14T09:15:23Z Lars-Peter Clausen lars@metafoo.de 2011-11-11T10:06:38Z urn:sha1:905905432868fa513f0f783fb9e5724536f4ee1f Commit 8dc7a9c84 ("blackfin: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE") inserted some of the include statements into sections protected by an unrelated #if CONFIG_... statement. This can cause, depending on the configuration used, warnings like this one: arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: data definition has no type or storage class arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: type defaults to ‘int’ in declaration of ‘EXPORT_SYMBOL’ arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: parameter names (without types) in function declaration This patch fixes it by moving the includes out of the #if protected sections. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Bob Liu <lliubbo@gmail.com> 2011-11-14T09:11:25Z Sonic Zhang sonic.zhang@analog.com 2011-08-01T09:53:21Z urn:sha1:edb0a6408a84b4f14647770d8a6796afff3e93a9 The serial TX IRQ is not simply (RX IRQ + 1) on some Blackfin chips, so move the values to the platform resources. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Bob Liu <lliubbo@gmail.com> 2011-11-14T08:47:04Z Linus Torvalds torvalds@linux-foundation.org 2011-11-14T08:47:04Z urn:sha1:7f80850d3f9fd8fda23a317044aef3a6bafab06b * 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh: ARM: mach-shmobile: cpuidle single/global and last_state fixes ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h ARM: mach-shmobile: move helper macro PORT_xx to sh_pfc.h ARM: mach-shmobile: move helper macro PORT_DATA_xx to sh_pfc.h ARM: mach-shmobile: ap4evb: remove white space from end of line ARM: mach-shmobile: clock-sh7372: remove un-necessary index ARM: mach-shmobile: kota2: add comment out separator ARM: mach-shmobile: sh73a0: add MMC data pin pull-up 2011-11-14T08:45:30Z Linus Torvalds torvalds@linux-foundation.org 2011-11-14T08:45:30Z urn:sha1:b93cd6a0c7352b428ba2b8437b44fff6e76d81d2 * 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh: mailmap: Fix up some renesas attributions sh: clkfwk: Kill off remaining debugfs cruft. drivers: sh: Kill off dead pathname for runtime PM stub. drivers: sh: Generalize runtime PM platform stub. sh: Wire up process_vm syscalls. sh: clkfwk: add clk_rate_mult_range_round() serial: sh-sci: Fix up SH-2A SCIF support. sh: Fix cached/uncaced address calculation in 29bit mode 2011-11-12T15:29:04Z Linus Torvalds torvalds@linux-foundation.org 2011-11-12T15:29:04Z urn:sha1:5b34b08996decc53a993287282e2cd42b90e02f7 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm/imx: fix imx6q mmc error when mounting rootfs arm/imx: fix AUTO_ZRELADDR selection arm/imx: fix the references to ARCH_MX3 ARM: mx51/53: set pwm clock parent to ipg_perclk arm/tegra: enable headphone detection gpio on seaboard arm/dt: Fix ventana SDHCI power-gpios arm/tegra: Don't create duplicate gpio and pinmux devices ARM: at91: Fix USBA gadget registration atmel/spi: fix missing probe at91/yl-9200: Fix section mismatch at91: vmalloc fix missing AT91_VIRT_BASE define ARM: at91: usart: drop static map regs for dbgu ARM: picoxcell: add extra temp register to addruart ARM: msm: fix compilation flags for MSM_SCM arm/mxs: fix mmc device adding for mach-mx28evk ARM: mxc: Remove test_for_ltirq ARM:i.MX: fix build error in clock-mx51-mx53.c ARM:i.MX: fix build error in tzic/avic.c ARM: mxc: fix local timer interrupt handling msm: boards: Fix fallout from removal of machine_desc in fixup 2011-11-12T02:04:51Z Linus Torvalds torvalds@linux-foundation.org 2011-11-12T02:04:51Z urn:sha1:8f042aa75afccc45c5b60517f51644bce3f52545 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (29 commits) m68k/mac: Remove mac_irq_{en,dis}able() wrappers m68k/irq: Remove obsolete support for user vector interrupt fixups m68k/irq: Remove obsolete m68k irq framework m68k/q40: Convert Q40/Q60 to genirq m68k/sun3: Convert Sun3/3x to genirq m68k/sun3: Use the kstat_irqs_cpu() wrapper m68k/apollo: Convert Apollo to genirq m68k/vme: Convert VME to genirq m68k/hp300: Convert HP9000/300 and HP9000/400 to genirq m68k/mac: Optimize interrupts using chain handlers m68k/mac: Convert Mac to genirq m68k/amiga: Optimize interrupts using chain handlers m68k/amiga: Convert Amiga to genirq m68k/amiga: Refactor amiints.c m68k/atari: Remove code and comments about different irq types m68k/atari: Convert Atari to genirq m68k/irq: Add genirq support m68k/irq: Remove obsolete IRQ_FLG_* users m68k/irq: Rename {,__}m68k_handle_int() m68k/irq: Add m68k_setup_irq_controller() ... 2011-11-12T02:01:51Z Linus Torvalds torvalds@linux-foundation.org 2011-11-12T02:01:51Z urn:sha1:3455229fd6a51978439f9c6256d677b745fad06b * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/kvm: Fix build failure with HV KVM and CBE powerpc/ps3: Fix lv1_gpu_attribute hcall powerpc/ps3: Fix PS3 repository build warnings powerpc/ps3: irq: Remove IRQF_DISABLED powerpc/irq: Remove IRQF_DISABLED powerpc/numa: NUMA topology support for PowerNV powerpc: Add System RAM to /proc/iomem powerpc: Add KVM as module to defconfigs powerpc/kvm: Fix build with older toolchains powerpc, tqm5200: update tqm5200_defconfig to fit for charon board. powerpc/5200: add support for charon board 2011-11-12T01:59:40Z Linus Torvalds torvalds@linux-foundation.org 2011-11-12T01:59:40Z urn:sha1:732783fea085e3464c4ea4940dbb540ac8675e79 * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: Fix missing system calls check on mips.