aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-01-26ARM: amba: bcmring: use common amba device initializersRussell King1-21/+2
Signed-off-by: Russell King <[email protected]>
2012-01-26ARM: amba: ep93xx: use common amba device initializersRussell King1-40/+6
Acked-by: H Hartley Sweeten <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-26ARM: amba: omap2: use common amba device initializersRussell King1-24/+2
Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-26ARM: amba: integrator: use common amba device initializersRussell King2-97/+22
Tested-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-26ARM: amba: realview: get rid of private platform amba_device initializerRussell King6-110/+100
Acked-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: versatile: get rid of private platform amba_device initializerRussell King3-38/+28
Tested-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: vexpress: get rid of private platform amba_device initializerRussell King3-31/+14
Acked-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: provide common initializers for static amba devicesRussell King1-0/+33
Acked-by: H Hartley Sweeten <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: make use of -1 IRQs warnRussell King1-0/+3
Make the core warn about the use of -1 (NO_IRQ) Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: u300: get rid of NO_IRQ initializersRussell King1-3/+3
Acked-by: Linus Walleij <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: spear: get rid of NO_IRQ initializersRussell King3-8/+8
Acked-by: Viresh Kumar <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: netx: get rid of NO_IRQ initializersRussell King1-1/+1
Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: nomadik: get rid of NO_IRQ initializersRussell King1-2/+2
Acked-by: Alessandro Rubini <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: mxs: get rid of NO_IRQ initializersRussell King1-1/+1
Acked-by: Shawn Guo <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: lpc32xx: get rid of NO_IRQ initializersRussell King1-2/+2
Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: integrator/realview/versatile/vexpress: get rid of NO_IRQ ↵Russell King10-129/+129
initializers Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: samsung: get rid of NO_IRQ initializersRussell King4-7/+7
Acked-by: Kukjin Kim <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: get rid of NO_IRQ initializersRussell King1-3/+3
Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: ux500: get rid of NO_IRQRussell King1-1/+0
irq 0 now means no irq, so get rid of this unnecessary initializer. Acked-by: srinidhi kasagar <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: make irq 0 invalidRussell King2-3/+3
Fix core bus and MMCI such that irq 0 means that there is no IRQ attached. Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: mxs: convert to use amba_device_allocRussell King1-3/+5
Convert MXS to use the new amba_device_alloc APIs. Acked-by: Shawn Guo <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: integrator: convert to use amba_device_allocRussell King1-6/+3
Convert Integrator IM/PD-1 to use the new amba_device_alloc APIs. Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: ux500: convert to use amba_device_allocRussell King1-9/+3
Convert ux500 to use the new amba_device_alloc APIs. Acked-by: srinidhi kasagar <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: of: convert to use amba_device_allocRussell King1-3/+3
Convert DT code to use the new amba_device_alloc APIs. Acked-by: Rob Herring <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: amba: add amba_device allocation/add/put functionsRussell King2-25/+78
Add functions to allocate and initialize AMBA device structures, and add them to the Linux device manager. This allows us to kill this type of operation from individual platforms, moving it to core code. Signed-off-by: Russell King <[email protected]>
2012-01-25ARM: 7300/1: realview: fix definition of GPIO0 interrupt on PB1176 to match TRMWill Deacon2-2/+2
Currently, -1 is used as the GPIO0 interrupt on realview PB1176 and an AMBA device is registered with this parameter. With the pending NO_IRQ cleanup, this will lead to a warning at boot time, since -1 is obviously broken. This patch updates the interrupt used for GPIO0 to match that specified by the TRM. Unfortunately, it's not clear how to trigger this interrupt so we trust that the documentation is correct. Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-01-19Linux 3.3-rc1Linus Torvalds1-2/+2
2012-01-19Merge branches 'sched-urgent-for-linus', 'perf-urgent-for-linus' and ↵Linus Torvalds9-104/+444
'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/accounting, proc: Fix /proc/stat interrupts sum * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tracepoints/module: Fix disabling tracepoints with taint CRAP or OOT x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore x86/kprobes: Fix typo transferred from Intel manual * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits x86, tsc: Fix SMI induced variation in quick_pit_calibrate() x86, opcode: ANDN and Group 17 in x86-opcode-map.txt x86/kconfig: Move the ZONE_DMA entry under a menu x86/UV2: Add accounting for BAU strong nacks x86/UV2: Ack BAU interrupt earlier x86/UV2: Remove stale no-resources test for UV2 BAU x86/UV2: Work around BAU bug x86/UV2: Fix BAU destination timeout initialization x86/UV2: Fix new UV2 hardware by using native UV2 broadcast mode x86: Get rid of dubious one-bit signed bitfield
2012-01-19Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds4-7/+8
gpio bug fixes for v3.3 * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: gpio: tps65910: Use correct offset for gpio initialization gpio/it8761e: Restrict it8761e gpio driver to x86. gpio-ml-ioh: cleanup __iomem annotation usage gpio-ml-ioh: cleanup NULL pointer checking gpio-pch: cleanup __iomem annotation usage gpio-pch: cleanup NULL pointer checking
2012-01-19Merge branch 'for-linus' of ↵Linus Torvalds3-40/+27
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: qnx4: don't leak ->BitMap on late failure exits qnx4: reduce the insane nesting in qnx4_checkroot() qnx4: di_fname is an array, for crying out loud... vfs: remove printk from set_nlink() wake up s_wait_unfrozen when ->freeze_fs fails
2012-01-19x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bitsH. Peter Anvin1-0/+1
In checkin 303395ac3bf3 x86: Generate system call tables and unistd_*.h from tables the feature macros in <asm/unistd.h> were unified between 32 and 64 bits. Unfortunately 32 bits requires __ARCH_WANT_SYS_IPC and this was inadvertently dropped. Reported-by: Dmitry Kasatkin <[email protected]> Cc: Linus Torvalds <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]> Link: http://lkml.kernel.org/r/CALLzPKbeXN5gdngo8uYYU8mAow=XhrwBFBhKfG811f37BubQOg@mail.gmail.com
2012-01-19Merge remote-tracking branch 'linus/master' into x86/urgentH. Peter Anvin9587-258975/+463528
2012-01-19Merge branch 'for-linus' of ↵Linus Torvalds4-5/+8
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: KEYS: Permit key_serial() to be called with a const key pointer keys: fix user_defined key sparse messages ima: fix cred sparse warning MPILIB: Add a missing ENOMEM check
2012-01-19qnx4: don't leak ->BitMap on late failure exitsAl Viro1-1/+3
Signed-off-by: Al Viro <[email protected]>
2012-01-19qnx4: reduce the insane nesting in qnx4_checkroot()Al Viro1-34/+22
Signed-off-by: Al Viro <[email protected]>
2012-01-19qnx4: di_fname is an array, for crying out loud...Al Viro1-14/+12
(struct qnx4_inode_entry *)(bh->b_data + some_offset)->di_fname is not going to be NULL, TYVM... Signed-off-by: Al Viro <[email protected]>
2012-01-19KEYS: Permit key_serial() to be called with a const key pointerDavid Howells1-1/+1
Permit key_serial() to be called with a const key pointer. Signed-off-by: David Howells <[email protected]> Signed-off-by: James Morris <[email protected]>
2012-01-19keys: fix user_defined key sparse messagesMimi Zohar1-3/+3
Replace the rcu_assign_pointer() calls with rcu_assign_keypointer(). Signed-off-by: Mimi Zohar <[email protected]> Signed-off-by: David Howells <[email protected]> Signed-off-by: James Morris <[email protected]>
2012-01-19ima: fix cred sparse warningMimi Zohar1-1/+2
Fix ima_policy.c sparse "warning: dereference of noderef expression" message, by accessing cred->uid using current_cred(). Changelog v1: - Change __cred to just cred (based on David Howell's comment) Signed-off-by: Mimi Zohar <[email protected]> Signed-off-by: James Morris <[email protected]>
2012-01-18uml: fix compile for x86-64Linus Torvalds1-0/+5
Randy Dunlap reports that we get arch/x86/um/shared/sysdep/ptrace.h:7:20: error: redefinition of 'regs_return_value' arch/x86/um/shared/sysdep/ptrace.h:7:20: note: previous definition of 'regs_return_value' was here when compiling UML for x86-64. Stephen Rothwell root-caused it and says: "Caused by commit d7e7528bcd45 ("Audit: push audit success and retcode into arch ptrace.h") (another patch that was never in linux-next :-(). This file now needs protection against double inclusion." so let's do as the man says. Reported-by: Randy Dunlap <[email protected]> Analyzed-by: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-01-19MPILIB: Add a missing ENOMEM checkDavid Howells1-0/+2
Add a missing ENOMEM check. Signed-off-by: David Howells <[email protected]> Acked-by: Mimi Zohar <[email protected]> Signed-off-by: James Morris <[email protected]>
2012-01-18Merge branch 'for-next-merge' of ↵Linus Torvalds7-0/+4672
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending * 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: ib_srpt: Initial SRP Target merge for v3.3-rc1
2012-01-18Merge branch 'for-next' of ↵Linus Torvalds51-1014/+829
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (26 commits) target: Set additional sense length field in sense data target: Remove legacy device status check from transport_execute_tasks target: Remove __transport_execute_tasks() for each processing context target: Remove extra se_device->execute_task_lock access in fast path target: Drop se_device TCQ queue_depth usage from I/O path target: Fix possible NULL pointer with __transport_execute_tasks target: Remove TFO->check_release_cmd() fabric API caller tcm_fc: Convert ft_send_work to use target_submit_cmd target: Add target_submit_cmd() for process context fabric submission target: Make target_put_sess_cmd use target_release_cmd_kref target: Set response format in INQUIRY response target: tcm_mod_builder: small fixups Documentation/target: Fix tcm_mod_builder.py build breakage target: remove overagressive ____cacheline_aligned annoations tcm_loop: bump max_sectors target/configs: remove trailing newline from udev_path and alias iscsi-target: fix chap identifier simple_strtoul usage target: remove useless casts target: simplify target_check_cdb_and_preempt target: Move core_scsi3_check_cdb_abort_and_preempt ...
2012-01-18Merge branch 'release' of ↵Linus Torvalds182-795/+4824
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux This includes initial support for the recently published ACPI 5.0 spec. In particular, support for the "hardware-reduced" bit that eliminates the dependency on legacy hardware. APEI has patches resulting from testing on real hardware. Plus other random fixes. * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (52 commits) acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec intel_idle: Split up and provide per CPU initialization func ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2 ACPI processor: Remove unneeded cpuidle_unregister_driver call intel idle: Make idle driver more robust intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle ACPI: kernel-parameters.txt : Add intel_idle.max_cstate intel_idle: remove redundant local_irq_disable() call ACPI processor: Fix error path, also remove sysdev link ACPI: processor: fix acpi_get_cpuid for UP processor intel_idle: fix API misuse ACPI APEI: Convert atomicio routines ACPI: Export interfaces for ioremapping/iounmapping ACPI registers ACPI: Fix possible alignment issues with GAS 'address' references ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64) ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64) ACPI: Store SRAT table revision ACPI, APEI, Resolve false conflict between ACPI NVS and APEI ACPI, Record ACPI NVS regions ACPI, APEI, EINJ, Refine the fix of resource conflict ...
2012-01-18tpm: fix (ACPI S3) suspend regressionStefan Berger2-0/+12
This patch fixes an (ACPI S3) suspend regression introduced in commit 68d6e6713fcb ("tpm: Introduce function to poll for result of self test") and occurring with an Infineon TPM and tpm_tis and tpm_infineon drivers active. The suspend problem occurred if the TPM was disabled and/or deactivated and therefore the TPM_PCRRead checking the result of the (asynchronous) self test returned an error code which then caused the tpm_tis driver to become inactive and this then seemed to have negatively influenced the suspend support by the tpm_infineon driver... Besides that the tpm_tis drive may stay active even if the TPM is disabled and/or deactivated. Signed-off-by: Stefan Berger <[email protected]> Tested-by: Rafael J. Wysocki <[email protected]> Acked-by: Rajiv Andrade <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-01-18nvme: fix merge error due to change of 'make_request_fn' fn typeLinus Torvalds1-7/+1
The type of 'make_request_fn' changed in 5a7bbad27a4 ("block: remove support for bio remapping from ->make_request"), but the merge of the nvme driver didn't take that into account, and as a result the driver would compile with a warning: drivers/block/nvme.c: In function 'nvme_alloc_ns': drivers/block/nvme.c:1336:2: warning: passing argument 2 of 'blk_queue_make_request' from incompatible pointer type [enabled by default] include/linux/blkdev.h:830:13: note: expected 'void (*)(struct request_queue *, struct bio *)' but argument is of type 'int (*)(struct request_queue *, struct bio *)' It's benign, but the warning is annoying. Reported-by: Stephen Rothwell <[email protected]> Cc: Matthew Wilcox <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-01-18xen: using EXPORT_SYMBOL requires including export.hStephen Rothwell1-0/+1
Fix these warnings: drivers/xen/biomerge.c:14:1: warning: data definition has no type or storage class [enabled by default] drivers/xen/biomerge.c:14:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int] drivers/xen/biomerge.c:14:1: warning: parameter names (without types) in function declaration [enabled by default] And this build error: ERROR: "xen_biovec_phys_mergeable" [drivers/block/nvme.ko] undefined! Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-01-18Merge branch 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linuxLinus Torvalds4-54/+119
* 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux: i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH i2c-eg20t: modified the setting of transfer rate. i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number i2c: OMAP: Add DT support for i2c controller I2C: OMAP: NACK without STP I2C: OMAP: correct SYSC register offset for OMAP4
2012-01-18Merge branch 'v4l_for_linus' of ↵Linus Torvalds56-679/+727
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits) [media] as3645a: Fix compilation by including slab.h [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c [media] ds3000: using logical && instead of bitwise & [media] v4l2-ctrls: make control names consistent [media] DVB: dib0700, add support for Nova-TD LEDs [media] DVB: dib0700, add corrected Nova-TD frontend_attach [media] DVB: dib0700, separate stk7070pd initialization [media] DVB: dib0700, move Nova-TD Stick to a separate set [media] : add MODULE_FIRMWARE to dib0700 [media] DVB-CORE: remove superfluous DTV_CMDs [media] s5p-jpeg: adapt to recent videobuf2 changes [media] s5p-g2d: fixed a bug in controls setting function [media] s5p-mfc: Fix volatile controls setup [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test [media] s5p-fimc: Fix incorrect control ID assignment [media] dvb_frontend: Don't call get_frontend() if idle [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters ...
2012-01-18Merge branch 'fix/asoc' of ↵Linus Torvalds5-7/+19
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: Wait for WM8993 FLL to stabilise ASoC: core - Free platform DAPM context at platform removal. ASoC: dapm - Fix check for codec context in dapm_power_widgets(). ASoC: sgtl5000: update author email address ASoC: Fix DMA channel leak in imx-pcm-dma-mx2 driver.
Powered by cgit, Gruvboxed by Blaster4385.