aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-06V4L/DVB: V4L - Makfile:Removed duplicate entry of davinciVaibhav Hiremath1-2/+0
Signed-off-by: Vaibhav Hiremath <[email protected]> Signed-off-by: Muralidharan Karicheri <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-06V4L/DVB: omap24xxcam: potential buffer overflowDan Carpenter1-1/+1
The previous loop goes until last == VIDEO_MAX_FRAME, so this could potentially go one past the end of the loop. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Sakari Ailus <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-06ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155xKamal Mostafa1-0/+24
Add Dell Studio models (1558, 1557, 1555) to the 'set_sci_en_on_resume' list to fix hang on resume. BugLink: http://bugs.launchpad.net/bugs/553498 Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Alex Chiang <[email protected]> Cc: [email protected] Signed-off-by: Len Brown <[email protected]>
2010-05-06rcu: create rcu_my_thread_group_empty() wrapperPaul E. McKenney2-0/+13
Some RCU-lockdep splat repairs need to know whether they are running in a single-threaded process. Unfortunately, the thread_group_empty() primitive is defined in sched.h, and can induce #include hell. This commit therefore introduces a rcu_my_thread_group_empty() wrapper that is defined in rcupdate.c, thus avoiding the need to include sched.h everywhere. Signed-off-by: "Paul E. McKenney" <[email protected]>
2010-05-06Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds24-343/+278
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Defconfig update microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macros microblaze: Fix consistent-sync code microblaze: Define correct L1_CACHE_SHIFT value microblaze: cpuinfo shows cache line length microblaze: Fix kmalloc alignment on non-coherent DMA platforms microblaze: Fix typo fault in cache code microblaze: Fix consistent code microblaze: pci-dma: use include/linux/dma-mapping.h microblaze: page.h: Remove get_user_page and free_user_page microblaze: Remove "cache" optimized copy_page function microblaze: invoke oom-killer from page fault microblaze: fix divide by zero exception message microblaze: Add isa_dma_bridge_buggy to dma.h microblaze: Remove ancient code microblaze: Quiet section mismatch warnings for MMU version microblaze: Quiet section mismatch warnings microblaze: Fix IRQ entry/exit ftracing microblaze: resource/PCI: align functions now return start of resource microblaze: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs
2010-05-06Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds17-137/+156
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa/colibri: fix missing #include <mach/mfp.h> in colibri.h [ARM] pxa/spitz: fix On/off key name to fix warning during boot [ARM] pxa: fix the incorrect cpu_is_pxa950() [ARM] pxa: update cpuid pattern for pxa9xx in head.S [ARM] pxa/viper: fix timeout usage for I2C [ARM] pxa/raumfeld: fix button name [ARM] pxa/imote2: Fix iMote2 defconfig [ARM] pxa: add missing new line to regs-u2d.h ARM: 6093/1: Fix kernel memory printing for sparsemem arch/arm/include/asm/elf.h: forward-declare the task-struct arch/arm/plat-pxa/dma.c: correct NULL test ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver ARM: 6075/1: SA1100: fix wrong CPU type for h3100 and h3600 ARM: Update mach-types ARM: 6066/1: Fix "BUG: scheduling while atomic: swapper/0/0x00000002 ARM: 6068/1: Fix build break with KPROBES enabled mx5: Fix build error for mx51_defconfig
2010-05-06Merge branch 'sh/for-2.6.34' of ↵Linus Torvalds6-25/+40
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: fix a number of Oopses and leaks in SH framebuffer driver SH: fix error paths in DMA driver sh: sh7751 pci controller io port fix sh: Fix maximum number of SCIF ports in R2D defconfigs SH: fix TS field shift calculation for DMA drivers
2010-05-06microblaze: Defconfig updateMichal Simek2-13/+84
Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macrosMichal Simek1-27/+35
1. Remove CACHE_ALL_LOOP2 macro because it is identical to CACHE_ALL_LOOP 2. Change BUG_ON to WARN_ON 3. Remove end aligned from CACHE_LOOP_LIMITS. C implementation do not need aligned end address and ASM code do aligned in their macros 4. ASM optimized CACHE_RANGE_LOOP_1/2 macros needs to get aligned end address. Because end address is compound from start + size, end address is the first address which is exclude. Here is the corresponding code which describe it. + int align = ~(line_length - 1); + end = ((end & align) == end) ? end - line_length : end & align; a) end is aligned: it is necessary to subtruct line length because we don't want to work with next cacheline b) end address is not aligned: Just align it to be ready for ASM code. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Fix consistent-sync codeMichal Simek1-1/+1
PCI_DMA_FROMDEVICE should call invalidation not flushing. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Define correct L1_CACHE_SHIFT valueMichal Simek1-1/+1
Microblaze cacheline length is configurable and current cpu uses two cacheline length 4 and 8. We are taking conservative maximum value to be sure that cacheline alignment is satisfied for all cases. Here is the calculation for cacheline lenght 8 32bit=4Byte values which is corresponding with SHIFT 5. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: cpuinfo shows cache line lengthMichal Simek1-4/+6
Show cache line length in /proc/cpuinfo. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Fix kmalloc alignment on non-coherent DMA platformsMichal Simek1-0/+3
Based on PowerPC patche 52142e756e9bf6485d3d53596e8aff2e816a7253 PowerPC description: On platforms doing non-coherent DMA (4xx, 8xx, ...), it's important that the kmalloc minimum alignment is set to the cache line size, to avoid sharing cache lines between different objects, so that DMA to one of the objects doesn't corrupt the other. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Fix typo fault in cache codeMichal Simek1-5/+5
Copy & paste error. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Fix consistent codeMichal Simek3-92/+100
This patch fix consistent code which had problems with consistent_free function. I am not sure if we need to call flush_tlb_all after it but it keeps tlbs synced. I added noMMU and MMU version together. Uncached shadow feature is not tested. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: pci-dma: use include/linux/dma-mapping.hMichal Simek1-8/+0
Based on af407c6db16aa9ca63559076dbe620220a822580 and f41b177157718abe9a93868bb76e47d4a6f3681d Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: page.h: Remove get_user_page and free_user_pageMichal Simek1-5/+0
Remove ancient macros which are here from Linux-2.4 Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Remove "cache" optimized copy_page functionMichal Simek3-39/+2
Current implementation doesn't handle dcache_line_length correctly that's why is better to use generic memcpy. Cache optimized function could be good way howto improve performance but must be based on benchmarking not blind function like this. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: invoke oom-killer from page faultNick Piggin1-9/+4
As explained in commit 1c0fe6e3bd, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Cc: [email protected] Cc: Michal Simek <[email protected]> Cc: [email protected] Signed-off-by: Nick Piggin <[email protected]> Acked-by: David Rientjes <[email protected]> Acked-by: Michal Simek <[email protected]>
2010-05-06microblaze: fix divide by zero exception messageRandy Dunlap1-1/+1
Fix divide exception message to say "divide by zero". Signed-off-by: Randy Dunlap <[email protected]> Cc: Michal Simek <[email protected]> Cc: [email protected] Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Add isa_dma_bridge_buggy to dma.hMichal Simek1-0/+6
It is necessary for several drivers. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Remove ancient codeMichal Simek5-111/+0
I found several function which we don't use that's why I am removing them. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Quiet section mismatch warnings for MMU versionMichal Simek2-15/+16
Remove section mismatch - based on ppc aproach. WARNING: vmlinux.o(.text+0x64834): Section mismatch in reference from the function __pte_alloc_kernel() to the function .init.text:early_get_page() The function __pte_alloc_kernel() references the function __init early_get_page(). This is often because __pte_alloc_kernel lacks a __init annotation or the annotation of early_get_page is wrong. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Quiet section mismatch warningsSteven J. Magnani2-2/+4
_start is located in .text, which causes mismatch warnings with machine_early_init() and start_kernel() in .init.text. Signed-off-by: Steven J. Magnani <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: Fix IRQ entry/exit ftracingSteven J. Magnani1-1/+2
Function traces on Microblaze don't include IRQ entry and exit arrows, i.e. 0) | memcpy_toiovec() { 0) ==========> | 0) | do_IRQ() { ... 0) <========== | 0) ! 5414.000 us | } ...because do_IRQ() doesn't have the proper attributes. Signed-off-by: Steven J. Magnani <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: resource/PCI: align functions now return start of resourceMichal Simek1-7/+6
This change should be part of b26b2d494b659f988b4d75eb394dfa0ddac415c9 Origin description: resource/PCI: align functions now return start of resource As suggested by Linus, align functions should return the start of a resource, not void. An update of "res->start" is no longer necessary. Signed-off-by: Michal Simek <[email protected]>
2010-05-06microblaze: PCI: add pci_bus_for_each_resource(), remove direct ↵Michal Simek1-2/+2
bus->resource[] refs This change should be part of 89a74ecccd1f78e51faf6287e5c0e93a92ac096e Origin description: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs No functional change; this converts loops that iterate from 0 to PCI_BUS_NUM_RESOURCES through pci_bus resource[] table to use the pci_bus_for_each_resource() iterator instead. This doesn't change the way resources are stored; it merely removes dependencies on the fact that they're in a table. Signed-off-by: Michal Simek <[email protected]>
2010-05-06Merge branch 'fix' of ↵Russell King8-121/+79
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
2010-05-06blk-cgroup: Fix RCU correctness warning in cfq_init_queue()Vivek Goyal1-0/+2
It is necessary to be in an RCU read-side critical section when invoking css_id(), so this patch adds one to blkiocg_add_blkio_group(). This is actually a false positive, because this is called at initialization time and hence always refers to the root cgroup, which cannot go away. [ 103.790505] =================================================== [ 103.790509] [ INFO: suspicious rcu_dereference_check() usage. ] [ 103.790511] --------------------------------------------------- [ 103.790514] kernel/cgroup.c:4432 invoked rcu_dereference_check() without protection! [ 103.790517] [ 103.790517] other info that might help us debug this: [ 103.790519] [ 103.790521] [ 103.790521] rcu_scheduler_active = 1, debug_locks = 1 [ 103.790524] 4 locks held by bash/4422: [ 103.790526] #0: (&buffer->mutex){+.+.+.}, at: [<ffffffff8114befa>] sysfs_write_file+0x3c/0x144 [ 103.790537] #1: (s_active#102){.+.+.+}, at: [<ffffffff8114bfa5>] sysfs_write_file+0xe7/0x144 [ 103.790544] #2: (&q->sysfs_lock){+.+.+.}, at: [<ffffffff812263b1>] queue_attr_store+0x49/0x8f [ 103.790552] #3: (&(&blkcg->lock)->rlock){......}, at: [<ffffffff8122e4db>] blkiocg_add_blkio_group+0x2b/0xad [ 103.790560] [ 103.790561] stack backtrace: [ 103.790564] Pid: 4422, comm: bash Not tainted 2.6.34-rc4-blkio-second-crash #81 [ 103.790567] Call Trace: [ 103.790572] [<ffffffff81068f57>] lockdep_rcu_dereference+0x9d/0xa5 [ 103.790577] [<ffffffff8107fac1>] css_id+0x44/0x57 [ 103.790581] [<ffffffff8122e503>] blkiocg_add_blkio_group+0x53/0xad [ 103.790586] [<ffffffff81231936>] cfq_init_queue+0x139/0x32c [ 103.790591] [<ffffffff8121f2d0>] elv_iosched_store+0xbf/0x1bf [ 103.790595] [<ffffffff812263d8>] queue_attr_store+0x70/0x8f [ 103.790599] [<ffffffff8114bfa5>] ? sysfs_write_file+0xe7/0x144 [ 103.790603] [<ffffffff8114bfc6>] sysfs_write_file+0x108/0x144 [ 103.790609] [<ffffffff810f527f>] vfs_write+0xae/0x10b [ 103.790612] [<ffffffff81069863>] ? trace_hardirqs_on_caller+0x10c/0x130 [ 103.790616] [<ffffffff810f539c>] sys_write+0x4a/0x6e [ 103.790622] [<ffffffff81002b5b>] system_call_fastpath+0x16/0x1b [ 103.790625] Located-by: Miles Lane <[email protected]> Signed-off-by: Vivek Goyal <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2010-05-06ACPI: fix acpi_hest_firmware_first_pci() caused oopsShaohua Li1-0/+4
acpi_hest_firmware_first_pci() could be called when acpi is disabled and cause system oops. Signed-off-by: Shaohua Li <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-05-06sbshc: acpi_device_class "smbus_host_controller" too longDan Carpenter1-1/+1
acpi_device_class can only be 19 characters and a NULL terminator. With the current name we get a buffer overflow in acpi_smbus_hc_add() when we do: strcpy(acpi_device_class(device), ACPI_SMB_HC_CLASS); Signed-off-by: Dan Carpenter <[email protected]> Cc: Alexey Starikovskiy <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-05-06power_meter: acpi_device_class "power_meter_resource" too longDan Carpenter1-1/+1
acpi_device_class can only be 19 characters and a NULL terminator. The current code has a buffer overflow in acpi_power_meter_add(): strcpy(acpi_device_class(device), ACPI_POWER_METER_CLASS); Signed-off-by: Dan Carpenter <[email protected]> Cc: Len Brown <[email protected]> Cc: "Darrick J. Wong" <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-05-06acpi_pad: "processor_aggregator" name too longDan Carpenter1-1/+1
cpi_device_class can only be 19 characters and a NULL terminator. With the current name we get a buffer overflow in acpi_pad_add() strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); [[email protected]: call it acpi_pad, per Shaohua Li] Signed-off-by: Dan Carpenter <[email protected]> Cc: walter harms <[email protected]> Acked-by: Shaohua Li <[email protected]> Cc: Len Brown <[email protected]> Acked-by: Pavel Machek <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-05-06PNP: don't check for conflicts with bridge windowsBjorn Helgaas1-0/+4
With fa35b4926, I broke a lot of PNP resource assignment. That commit made PNPACPI include bridge windows as PNP resources, and PNP resource assignment treats any enabled overlapping PNP resources as conflicts. Since PCI host bridge windows typically include most of the I/O port space, this makes PNP port assigments fail. The PCI host bridge driver will eventually use those PNP window resources, so we should make PNP ignore them when checking for conflicts. This fixes https://bugzilla.kernel.org/show_bug.cgi?id=15903 Reported-and-tested-by: Pavel Kysilka <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-05-06sh: fix a number of Oopses and leaks in SH framebuffer driverGuennadi Liakhovetski1-14/+13
Fix a number of Oopses, memory leaks and unbalanced calls on error paths in sh_mobile_lcdcfb.c. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-05-06[ARM] pxa/colibri: fix missing #include <mach/mfp.h> in colibri.hJakob Viketoft1-0/+1
The use of mfp_cfg_t causes build errors without including <mach/mfp.h>. CC: [email protected] CC: Daniel Mack <[email protected]> Signed-off-by: Jakob Viketoft <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-05-06[ARM] pxa/spitz: fix On/off key name to fix warning during bootPavel Machek1-1/+1
On/Off contains slash in the name, which causes warning during boot. Signed-off-by: Pavel Machek <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-05-06[ARM] pxa: fix the incorrect cpu_is_pxa950()Haojian Zhuang1-1/+1
Fix the wrong variable used in cpu_is_pxa950(). Signed-off-by: Haojian Zhuang <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-05-06[ARM] pxa: update cpuid pattern for pxa9xx in head.SHaojian Zhuang1-8/+2
Update CPUID pattern of PXA9xx in head.S and fix the duplicate entries for pxa935. Signed-off-by: Haojian Zhuang <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-05-06[ARM] pxa/viper: fix timeout usage for I2CWolfram Sang1-2/+3
The timeout value is in jiffies, so it should be using HZ, not a plain number. Assume with HZ=100 '100' means 1s here and adapt accordingly. Signed-off-by: Wolfram Sang <[email protected]> Acked-by: Marc Zyngier <[email protected]> Cc: Russell King <[email protected]> Cc: Paul Shen <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Jean Delvare <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-05-06[ARM] pxa/raumfeld: fix button nameDaniel Mack1-3/+2
"on/off button" was recently renamed to remove the slash character. Follow that change in the pin polarity detection as well. While at it, fix another cosmetic coding style flaw as well. Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-05-06[ARM] pxa/imote2: Fix iMote2 defconfigStefan Schmidt1-105/+67
- Bring in a CMDLINE that actually works and prints to the right tty - Compile-in JFFS2 to boot into rootfs - Remove unneeded options for Bluetooth and radio - Disable CPU_FREQ as it makes the flash driver fail Thanks Jonathan for spotting what I messed up. Signed-off-by: Stefan Schmidt <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-05-06[ARM] pxa: add missing new line to regs-u2d.hIgor Grinberg1-1/+2
Signed-off-by: Igor Grinberg <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-05-05Merge branch 'zerolen' of ↵Linus Torvalds2-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: [MTD] Remove zero-length files mtdbdi.c and internal.ho
2010-05-05Merge branch 'upstream-linus' of ↵Linus Torvalds3-37/+20
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs libata: Fix several inaccuracies in developer's guide
2010-05-05[MTD] Remove zero-length files mtdbdi.c and internal.hoJeff Garzik2-0/+0
Both were "removed" in commit a33eb6b91034c95b9b08576f68be170f995b2c7d. Signed-off-by: Jeff Garzik <[email protected]>
2010-05-05pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDsKristoffer Ericson2-4/+4
This patch fixes the bad hashes for one Kingston and one Transcend card. Thanks to komuro for pointing this out. Signed-off-by: Kristoffer Ericson <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-05-05libata: Fix several inaccuracies in developer's guideSergei Shtylyov1-33/+16
Commit 6bfff31e77cfa1b13490337e5a4dbaa3407e83ac (libata: kill probe_ent and related helpers) killed ata_device_add() but didn't remove references to it from the libata developer's guide. Commits 9363c3825ea9ad76561eb48a395349dd29211ed6 (libata: rename SFF functions) and 5682ed33aae05d10a25c95633ef9d9c062825888 (libata: rename SFF port ops) renamed the taskfile access methods but didn't update the developer's guide. Commit c9f75b04ed5ed65a058d18a8a8dda50632a96de8 (libata: kill ata_noop_dev_select()) didn't update the developer's guide as well. The guide also refers to the long gone ata_pio_data_xfer_noirq(), ata_pio_data_xfer(), and ata_mmio_data_xfer() -- replace those by the modern ata_sff_data_xfer_noirq(), ata_sff_data_xfer(), and ata_sff_data_xfer32(). Also, remove the reference to non-existant ata_port_stop()... Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-05-05Merge branch 'slab-for-linus' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Fix bad boundary check in init_kmem_cache_nodes()
2010-05-05slub: Fix bad boundary check in init_kmem_cache_nodes()Zhang, Yanmin1-1/+1
Function init_kmem_cache_nodes is incorrect when checking upper limitation of kmalloc_caches. The breakage was introduced by commit 91efd773c74bb26b5409c85ad755d536448e229c ("dma kmalloc handling fixes"). Acked-by: Christoph Lameter <[email protected]> Signed-off-by: Pekka Enberg <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.