aboutsummaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)AuthorFilesLines
2011-01-13[IA64] fix build error - arch/ia64/kernel/perfmon.cTony Luck1-1/+1
arch/ia64/kernel/perfmon.c:621: error: duplicate 'static' Introduced by commit c74a1cbb3cac348f276fabc381758f5b0b4713b2 pass default dentry_operations to mount_pseudo() Signed-off-by: Tony Luck <[email protected]>
2011-01-14ARM: mach-shmobile: ag5evm requires GPIOLIBYoshii Takashi1-0/+1
Because ag5evm board setup code uses gpio functions, ARCH_REQUIRE_GPIOLIB should be set in Kconfig. Otherwise, the first build with defconfig fails. Signed-off-by: Takashi YOSHII <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-01-14ARM: mach-shmobile: fix cpu_base of gic_init() on sh73a0Yoshii Takashi1-2/+3
The latest rmobile-latest doesn't run on ag5evm because of a small mistake on initialization. Though, I don't have any idea to write them smart. anyway, On sh73a0, GIC cpu_base is 0xf0000100 but 0xf0001000. Signed-off-by: Takashi YOSHII <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-01-13Merge branch 'for-linus' of ↵Linus Torvalds21-149/+206
git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6: avr32: update default configuration files for Atmel boards avr32: Convert to clocksource_register_hz avr32: make architecture sys_clone prototype match asm-generic prototype avr32: use syscall prototypes from asm-generic instead of arch avr32: disable kprobes for all default configurations avr32: boards: setup: use IS_ERR() instead of NULL check
2011-01-13avr32: update default configuration files for Atmel boardsHans-Christian Egtvedt10-109/+184
This patch adjusts some values to make the default configuration for Atmel boards more similar, and adds missing values to enable required functions. Also remove defined symbols for functions not in use. Signed-off-by: Hans-Christian Egtvedt <[email protected]>
2011-01-13avr32: Convert to clocksource_register_hzJohn Stultz1-4/+1
This converts the avr32 clocksource to use clocksource_register_hz. This is untested, so any assistance in testing would be appreciated! CC: Hans-Christian Egtvedt <[email protected]> CC: Thomas Gleixner <[email protected]> Signed-off-by: John Stultz <[email protected]>
2011-01-13avr32: make architecture sys_clone prototype match asm-generic prototypeHans-Christian Egtvedt2-10/+4
This patch will fix the arguments to the architecture sys_clone() function to match the asm-generic/syscalls.h prototype. In the same go remove the architecture specific prototype for the same function. The sys_clone() function is only called from assembly, hence the argument types were not having any affect. Signed-off-by: Hans-Christian Egtvedt <[email protected]>
2011-01-13avr32: use syscall prototypes from asm-generic instead of archHans-Christian Egtvedt1-9/+0
This patch removes the redundant syscalls prototypes in the architecture specific syscalls.h header file. These were identical with the ones in asm-generic/syscalls.h. Signed-off-by: Hans-Christian Egtvedt <[email protected]> Reported-by: Peter Huewe <[email protected]> Reported-by: Sven Schnelle <[email protected]> Cc: stable <[email protected]>
2011-01-13avr32: disable kprobes for all default configurationsHans-Christian Egtvedt11-11/+11
This patch will disable kprobes for all the default AVR32 board configurations. This works around a regression in kprobes which seems to be related to AVR32 is now lacking the struct kprobe_ctlblk. Signed-off-by: Hans-Christian Egtvedt <[email protected]>
2011-01-13avr32: boards: setup: use IS_ERR() instead of NULL checkVasiliy Kulikov6-6/+6
clk_get() returns ERR_PTR() on error, not NULL. Signed-off-by: Vasiliy Kulikov <[email protected]> Acked-by: Hans-Christian Egtvedt <[email protected]>
2011-01-13Merge branch 'release' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix format warning in arch/ia64/kernel/acpi.c
2011-01-13Merge branch 'rmobile-latest' of ↵Linus Torvalds8-19/+67
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: Kill off unused !gpio_is_valid() case ARM: mach-shmobile: sh7372 Enable SDIO IRQs for Mackerel ARM: mach-shmobile: sh7377 Enable SDIO IRQs ARM: mach-shmobile: sh7367 Enable SDIO IRQs ARM: mach-shmobile: sh7372 Enable SDIO IRQs ARM: mach-shmobile: mackerel: Add touchscreen ST1232 support ARM: mach-shmobile: ap4eb: SCIF port for earlyprintk when using zboot ARM: mach-shmobile: mackerel: SCIF port for earlyprintk when using zboot ARM: mach-shmobile: mackerel: Add support get_cd in CN23
2011-01-13Merge branch 'sh-latest' of ↵Linus Torvalds64-158/+1009
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (31 commits) sh: Add support for AP-SH4AD-0A board. sh: Add support for AP-SH4A-3A board. sh: Add a new mach type for alpha project boards. serial: sh-sci: build fixes. sh: sh7372 SH4AL-DSP probe support sh: sh7366 Enable SDIO IRQs sh: sh7343 Enable SDIO IRQs sh: mach-ecovec24: enable runtime PM for SDHI sh: sh7723 / ap325rxa enable SDIO IRQs sh: sh7722 Enable SDIO IRQs sh: sh7724 Enable SDIO IRQs sh: Fix up legacy PTEA space attribute mapping. sh: Stub out legacy PCC pgprot encoding for X2 TLBs. sh: constify prefetch pointers. sh: Add a machvec callback for early memblock reservations. sh: update sh7757lcr_defconfig sh: add PVR probing for SH7757 3rd cut sh: Use device_initcall() instead of __initcall() sh: intc - convert board specific landisk code sh: Move init_landisk_IRQ to header file ...
2011-01-13Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6Linus Torvalds16-40/+374
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (29 commits) video: move SH_MIPI_DSI/SH_LCD_MIPI_DSI to the top of menu fbdev: Implement simple blanking in pseudocolor modes for vt8500lcdfb video: imx: Update the manufacturer's name nuc900fb: don't treat NULL clk as an error s3c2410fb: don't treat NULL clk as an error video: tidy up modedb formatting. video: matroxfb: Correct video option in comments and kernel config help. fbdev: sh_mobile_hdmi: simplify pointer handling fbdev: sh_mobile_hdmi: framebuffer notifiers have to be registered fbdev: sh_mobile_hdmi: add command line option to use the preferred EDID mode OMAP: DSS2: Introduce omap_channel as an omap_dss_device parameter, add new overlay manager. OMAP: DSS2: Use dss_features to handle DISPC bits removed on OMAP4 OMAP: DSS2: LCD2 Channel Changes for DISPC OMAP: DSS2: Change remaining DISPC functions for new omap_channel argument OMAP: DSS2: Introduce omap_channel argument to DISPC functions used by interface drivers OMAP: DSS2: Represent DISPC register defines with channel as parameter OMAP: DSS2: Add dss_features for omap4 and overlay manager related features OMAP: DSS2: Clean up DISPC color mode validation checks OMAP: DSS2: Add back authors of panel-generic.c based drivers OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers ...
2011-01-13Merge branch 'for-linus' of ↵Linus Torvalds28-140/+850
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits) ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO ALSA: oxygen: fix Xonar DG input ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low ALSA: hda - Fix missing EAPD for Acer 4930G ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs. ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser ALSA: hda - Don't refer ELD when unplugged ASoC: tpa6130a2: Fix compiler warning ASoC: tlv320dac33: Add DAPM selection for LOM invert ASoC: DMIC codec: Adding a generic DMIC codec ALSA: snd-usb-us122l: Fix missing NULL checks ALSA: snd-usb-us122l: Fix MIDI output ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync() ASoC: Fix section mismatch in wm8995.c ALSA: oxygen: add S/PDIF source selection for Claro cards ALSA: oxygen: fix CD/MIDI for X-Meridian (2G) ASoC: fix migor audio build ALSA: include delay.h for msleep in Xonar DG support ...
2011-01-13Merge branch 'for-linus' of ↵Linus Torvalds1-2/+4
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (41 commits) fs: add documentation on fallocate hole punching Gfs2: fail if we try to use hole punch Btrfs: fail if we try to use hole punch Ext4: fail if we try to use hole punch Ocfs2: handle hole punching via fallocate properly XFS: handle hole punching via fallocate properly fs: add hole punching to fallocate vfs: pass struct file to do_truncate on O_TRUNC opens (try #2) fix signedness mess in rw_verify_area() on 64bit architectures fs: fix kernel-doc for dcache::prepend_path fs: fix kernel-doc for dcache::d_validate sanitize ecryptfs ->mount() switch afs move internal-only parts of ncpfs headers to fs/ncpfs switch ncpfs switch 9p pass default dentry_operations to mount_pseudo() switch hostfs switch affs switch configfs ...
2011-01-13Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2-37/+2335
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits) hwrng: via_rng - Fix memory scribbling on some CPUs crypto: padlock - Move padlock.h into include/crypto hwrng: via_rng - Fix asm constraints crypto: n2 - use __devexit not __exit in n2_unregister_algs crypto: mark crypto workqueues CPU_INTENSIVE crypto: mv_cesa - dont return PTR_ERR() of wrong pointer crypto: ripemd - Set module author and update email address crypto: omap-sham - backlog handling fix crypto: gf128mul - Remove experimental tag crypto: af_alg - fix af_alg memory_allocated data type crypto: aesni-intel - Fixed build with binutils 2.16 crypto: af_alg - Make sure sk_security is initialized on accept()ed sockets net: Add missing lockdep class names for af_alg include: Install linux/if_alg.h for user-space crypto API crypto: omap-aes - checkpatch --file warning fixes crypto: omap-aes - initialize aes module once per request crypto: omap-aes - unnecessary code removed crypto: omap-aes - error handling implementation improved crypto: omap-aes - redundant locking is removed crypto: omap-aes - DMA initialization fixes for OMAP off mode ...
2011-01-13Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds1-0/+2
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: Add MCF548x watchdog driver. watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs watchdog: Add TCO support for nVidia chipsets watchdog: Add support for sp5100 chipset TCO watchdog: f71808e_wdt: add F71862FG, F71869 to Kconfig watchdog: iTCO_wdt: TCO Watchdog patch for Intel DH89xxCC PCH watchdog: iTCO_wdt: TCO Watchdog patch for Intel NM10 DeviceIDs watchdog: ks8695_wdt: include mach/hardware.h instead of mach/timex.h. watchdog: Propagate Book E WDT period changes to all cores watchdog: add CONFIG_WATCHDOG_NOWAYOUT support to PowerPC Book-E watchdog driver watchdog: alim7101_wdt: fix compiler warning on alim7101_pci_tbl watchdog: alim1535_wdt: fix compiler warning on ali_pci_tbl watchdog: Fix reboot on W83627ehf chipset. watchdog: Add watchdog support for W83627DHG chip watchdog: f71808e_wdt: Add Fintek F71869 watchdog watchdog: add f71862fg support watchdog: clean-up f71808e_wdt.c
2011-01-13Merge branch 'for-linus' of ↵Linus Torvalds6-85/+102
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (45 commits) regulator: missing index in PTR_ERR() in isl6271a_probe() regulator: Assign return value of mc13xxx_reg_rmw to ret regulator: Add initial per-regulator debugfs support regulator: Make regulator_has_full_constraints a bool regulator: Clean up logging a bit regulator: Optimise out noop voltage changes regulator: Add API to re-apply voltage to hardware regulator: Staticise non-exported functions in mc13892 regulator: Only notify voltage changes when they succeed regulator: Provide a selector based set_voltage_sel() operation regulator: Factor out voltage set operation into a separate function regulator: Convert WM8994 to use get_voltage_sel() regulator: Convert WM835x to use get_voltage_sel() regulator: Allow modular build of mc13xxx-core regulator: support PMIC mc13892 make mc13783 regulator code generic Change the register name definitions for mc13783 mach-ux500: Updated and connected ab8500 regulator board configuration regulators: Removed macros for initialization of ab8500 regulators regulators: Added verbose debug messages to ab8500 regulators ...
2011-01-13Merge branch 'x86-olpc-for-linus' of ↵Linus Torvalds9-0/+220
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, olpc: Speed up device tree creation during boot x86, olpc: Add OLPC device-tree support x86, of: Define irq functions to allow drivers/of/* to build on x86
2011-01-13Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds28-986/+2015
* 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (142 commits) KVM: Initialize fpu state in preemptible context KVM: VMX: when entering real mode align segment base to 16 bytes KVM: MMU: handle 'map_writable' in set_spte() function KVM: MMU: audit: allow audit more guests at the same time KVM: Fetch guest cr3 from hardware on demand KVM: Replace reads of vcpu->arch.cr3 by an accessor KVM: MMU: only write protect mappings at pagetable level KVM: VMX: Correct asm constraint in vmcs_load()/vmcs_clear() KVM: MMU: Initialize base_role for tdp mmus KVM: VMX: Optimize atomic EFER load KVM: VMX: Add definitions for more vm entry/exit control bits KVM: SVM: copy instruction bytes from VMCB KVM: SVM: implement enhanced INVLPG intercept KVM: SVM: enhance mov DR intercept handler KVM: SVM: enhance MOV CR intercept handler KVM: SVM: add new SVM feature bit names KVM: cleanup emulate_instruction KVM: move complete_insn_gp() into x86.c KVM: x86: fix CR8 handling KVM guest: Fix kvm clock initialization when it's configured out ...
2011-01-13Merge branch 'for-next' of ↵Linus Torvalds83-97/+96
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13ARM: plat-stmp3xxx: irq_data conversion.Lennert Buytenhek2-17/+17
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: plat-spear: irq_data conversion.Lennert Buytenhek1-11/+11
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Viresh Kumar <[email protected]>
2011-01-13ARM: plat-orion: irq_data conversion.Lennert Buytenhek2-28/+27
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2011-01-13ARM: plat-omap: irq_data conversion.Lennert Buytenhek1-47/+46
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: plat-nomadik: irq_data conversion.Lennert Buytenhek1-28/+28
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Rabin Vincent <[email protected]>
2011-01-13ARM: plat-mxc: irq_data conversion.Lennert Buytenhek4-55/+55
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: w90x900: irq_data conversion.Lennert Buytenhek1-10/+10
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Wan ZongShun <[email protected]>
2011-01-13ARM: versatile: irq_data conversion.Lennert Buytenhek1-8/+10
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Russell King <[email protected]>
2011-01-13ARM: tegra: irq_data conversion.Lennert Buytenhek2-37/+37
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: tcc8k: irq_data conversion.Lennert Buytenhek1-28/+28
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: stmp37xx: irq_data conversion.Lennert Buytenhek1-12/+12
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: stmp378x: irq_data conversion.Lennert Buytenhek1-8/+8
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: shark: irq_data conversion.Lennert Buytenhek1-13/+13
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: sa1100: irq_data conversion.Lennert Buytenhek2-46/+46
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: rpc: irq_data conversion.Lennert Buytenhek1-30/+30
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Russell King <[email protected]>
2011-01-13ARM: PXA SoCs: irq_data conversion.Lennert Buytenhek15-129/+144
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: pnx4008: irq_data conversion.Lennert Buytenhek1-29/+33
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: omap2: irq_data conversion.Lennert Buytenhek1-10/+12
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: omap1: irq_data conversion.Lennert Buytenhek3-39/+41
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: nuc93x: irq_data conversion.Lennert Buytenhek1-8/+8
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Wan ZongShun <[email protected]>
2011-01-13ARM: ns9xxx: irq_data conversion.Lennert Buytenhek2-28/+28
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Uwe Kleine-König <[email protected]>
2011-01-13ARM: netx: irq_data conversion.Lennert Buytenhek1-15/+15
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: mx3: irq_data conversion.Lennert Buytenhek1-9/+9
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: msm: irq_data conversion.Lennert Buytenhek5-121/+118
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Gregory Bean <[email protected]> Acked-by: Daniel Walker <[email protected]>
2011-01-13ARM: mmp: irq_data conversion.Lennert Buytenhek2-31/+33
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: lpc32xx: irq_data conversion.Lennert Buytenhek1-28/+28
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: lh7a40x: irq_data conversion.Lennert Buytenhek5-78/+79
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: ks8695: irq_data conversion.Lennert Buytenhek1-21/+22
Signed-off-by: Lennert Buytenhek <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.