aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-16sparc32: add irq + smp declarations to headersSam Ravnborg5-13/+68
In preparation for cleaning up a number of files add declarations for irq and smp related data/functions to the relevant headers. This showed that the extern declaration of cputypval differed in the two files where it was used. As cputypval is defined like this: cputypval: .asciz "sun4c" the correct representation is a char array. Fix users to use the new declaration. Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-17unicore32 core architecture: mm related: generic codesGuanXuetao13-0/+1390
This patch includes generic codes for memory management. Signed-off-by: Guan Xuetao <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]>
2011-03-16sparc32: remove tick14.cSam Ravnborg3-44/+0
The two methods included in tick14.c was nop because the static variable linux_lvl14 was always NULL. So remove the file and callers. Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-17unicore32 core architecture: process/thread related codesGuanXuetao6-0/+912
This patch implements process/thread related codes. Backtrace and stacktrace are here. Signed-off-by: Guan Xuetao <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]>
2011-03-17unicore32 core architecture: low level entry and setup codesGuanXuetao6-0/+1820
This patch implements low level entry and setup codes. Signed-off-by: Guan Xuetao <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]>
2011-03-17unicore32 core architecture: processor and system headersGuanXuetao10-0/+810
This patch includes processor and system headers. System call interface is here. We used the syscall interface the same as asm-generic version. Signed-off-by: Guan Xuetao <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]>
2011-03-16sparc32/leon: FPU-FSR only available when FPU presentDaniel Hellstrom1-1/+1
Signed-off-by: Daniel Hellstrom <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-17unicore32 core architecture: generic elf and ksyms stuffGuanXuetao8-0/+571
This patch includes some generic stuff including elf and ksyms. Because all one-line asm-generic headers are auto-generated by ASM_GENERIC_HEADERS in arch/unicore32/Makefile, so the rest seems very little. ELF handling functions and module handling functions are also here. Signed-off-by: Guan Xuetao <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]>
2011-03-17unicore32 core architecture: build infrastructureGuanXuetao9-0/+758
This patch implements build infrastructure. Signed-off-by: Guan Xuetao <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]>
2011-03-17asm-generic headers: add arch-specific __strnlen_user calling in uaccess.hGuanXuetao1-3/+5
This patch changes the implementation of strnlen_user in include/asm-generic/uaccess.h. Originally, it calls strlen() function directly, which may not correctly handle the access of user space in most mmu-enabled architectures. New __strnlen_user is added for using as an architecture specific function. Signed-off-by: Guan Xuetao <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]>
2011-03-16SPARC/LEON: power down instruction different of different LEONsDaniel Hellstrom5-17/+97
The way a LEON is powered down is implemented differently depending on CHIP type. The AMBA Plug&Play system ID tells revision of GRLIB and CHIP. This is for example needed by the GR-LEON4-ITX board and the UT699. Previously the power down support for LEON was limited to SMP, now both SMP and UP systems use the instruction. Signed-off-by: Daniel Hellstrom <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-17asm-generic headers: add ftrace.hGuanXuetao1-0/+16
This patch adds ftrace.h into asm-generic headers. The file content could be empty in most architectures. Signed-off-by: Guan Xuetao <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2011-03-16sparc32: added U-Boot build target: uImageDaniel Hellstrom3-1/+66
This is only for LEON as u-boot for SPARC only supports LEON. Signed-off-by: Daniel Hellstrom <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-17asm-generic headers: add sizes.hGuanXuetao1-0/+47
This patch adds sizes.h into asm-generic headers. Only 32-bit version supported. Signed-off-by: Guan Xuetao <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2011-03-16sparc64: rename virt_irq => irq - IISam Ravnborg7-53/+53
The generic irq support uses the term 'irq' for the allocated irq number. Fix it so sparc64 use the same term for an irq as the generic irq support does. For a naive reader this is less confusing. Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-17asm-generic: fix inX/outX functions for architectures that have PCIGuanXuetao1-14/+19
The definitions for the PC-style PIO functions in asm-generic/io.h were meant as dummies so you could compile code on architectures without ISA and PCI buses. However, unicore32 actually wants to use them with a real PCI bus, so they need to be defined to actually address the register window holding the I/O ports. Signed-off-by: Arnd Bergmann <[email protected]>
2011-03-16sparc64: rename virt_irq => irq - ISam Ravnborg2-80/+77
The generic irq support uses the term 'irq' for the allocated irq number. Fix it so sparc64 use the same term for an irq as the generic irq support does. For a naive reader this is less confusing. Signed-off-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc64: use up-to-data genirq functionsSam Ravnborg2-59/+61
Drop all uses of deprecated genirq features. The irq_set_affinity() call got a third paramter 'force' which is unused. For now genirq does not use this paramter and it is ignored by sparc. Signed-off-by: Sam Ravnborg <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Josip Rodin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc64: use {get,set}_irq_data for handler_dataSam Ravnborg1-10/+10
{get,set}_irq_data uses the member "handler_data" in irq_data which fits the naem of the datatype. The change has no functional impact Signed-off-by: Sam Ravnborg <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc64: all pointers to irq_handler_data renamed to handler_dataSam Ravnborg1-39/+39
In preparation of moving to use irq_data.handler_data rename all pointers to irq_handler_data "handler_data". This will also prevent name clash when we introduce the new irq methods. Signed-off-by: Sam Ravnborg <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc: in handler_irq() rename irq parameter to pilSam Ravnborg3-21/+21
The generic irq support uses "irq" to identify the virtual irq number. To avoid confusion rename the argument to handler_irq() to pil to match the name of the parameter in the PCR register. Signed-off-by: Sam Ravnborg <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc64: fix direct access to irq_descSam Ravnborg1-7/+7
GENERIC_HARDIRQS_NO_DEPRECATED require us to access data via irq_data. No functional changes as data has same layout due to use of union Signed-off-by: Sam Ravnborg <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc: Fix sbus_alloc_coherent error handling.Kristoffer Glembo1-2/+2
Order of kfree and free_pages were swapped in the error handling. Signed-off-by: Kristoffer Glembo <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc: Make mmu_inval_dma_area take void * instead of unsigned long to ↵Kristoffer Glembo1-26/+27
minimize casts. Signed-off-by: Kristoffer Glembo <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc/leon: Make mmu_inval_dma_area flush dcache for LEONs without snooping ↵Kristoffer Glembo1-3/+7
enabled. Signed-off-by: Kristoffer Glembo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc/leon: Add LEON dma_ops.Kristoffer Glembo1-5/+13
This patch sets the dma_ops structure for LEON. It reuses the pci32_dma_ops. Signed-off-by: Kristoffer Glembo <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc: Add pci32_unmap_page.Kristoffer Glembo1-0/+8
Signed-off-by: Kristoffer Glembo <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16sparc: Replace open coded page alignment with PAGE_ALIGN macro.Kristoffer Glembo1-14/+11
Signed-off-by: Kristoffer Glembo <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds178-1725/+1407
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits) tty: serial: altera_jtaguart: Add device tree support tty: serial: altera_uart: Add devicetree support dt: eliminate of_platform_driver shim code dt: Eliminate of_platform_{,un}register_driver dt/serial: Eliminate users of of_platform_{,un}register_driver dt/usb: Eliminate users of of_platform_{,un}register_driver dt/video: Eliminate users of of_platform_{,un}register_driver dt/net: Eliminate users of of_platform_{,un}register_driver dt/sound: Eliminate users of of_platform_{,un}register_driver dt/spi: Eliminate users of of_platform_{,un}register_driver dt: uartlite: merge platform and of_platform driver bindings dt: xilinx_hwicap: merge platform and of_platform driver bindings ipmi: convert OF driver to platform driver leds/leds-gpio: merge platform_driver with of_platform_driver dt/sparc: Eliminate users of of_platform_{,un}register_driver dt/powerpc: Eliminate users of of_platform_{,un}register_driver dt/powerpc: move of_bus_type infrastructure to ibmebus drivercore/dt: add a match table pointer to struct device dt: Typo fix. altera_ps2: Add devicetree support ...
2011-03-16Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds55-619/+220
* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: BKL: That's all, folks fs/locks.c: Remove stale FIXME left over from BKL conversion ipx: remove the BKL appletalk: remove the BKL x25: remove the BKL ufs: remove the BKL hpfs: remove the BKL drivers: remove extraneous includes of smp_lock.h tracing: don't trace the BKL adfs: remove the big kernel lock
2011-03-17HID: add support for Logitech Driving Force Pro wheelJiri Kosina3-0/+4
Add force feedback support for Logitech Driving Force Pro wheel. Device IDs reported by Michal Malý. Reported-by: Michal Malý <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-03-17HID: hid-ortek: remove spurious referenceJiri Kosina1-2/+1
Remove spurious bugzilla reference from the source comment header. Also fix the comment to be more correct (it's HID report descriptor rather than USB). Signed-off-by: Jiri Kosina <[email protected]>
2011-03-17doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymoreMichal Hocko1-2/+1
commit 6837765963 ("mm: remove CONFIG_UNEVICTABLE_LRU config option") has removed the configoption so we should sync up the doc as well. Signed-off-by: Michal Hocko <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-03-16Merge branch 'p2v' into develRussell King86-189/+434
Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S
2011-03-16Merge branch 'v6v7' into develRussell King28-189/+191
Conflicts: arch/arm/include/asm/cacheflush.h arch/arm/include/asm/proc-fns.h arch/arm/mm/Kconfig
2011-03-16Merge branch 'misc' into develRussell King38-791/+461
Conflicts: arch/arm/Kconfig
2011-03-16Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', ↵Russell King688-6225/+11694
'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel
2011-03-17HID: add support for Ortek PKB-1700Herton Ronaldo Krzesinski4-3/+6
As reported on http://ubuntuforums.org/showthread.php?t=1594007 the PKB-1700 needs same special handling as WKB-2000. This change is originally based on patch posted by user asmoore82 on the Ubuntu forums. Cc: [email protected] Signed-off-by: Herton Ronaldo Krzesinski <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-03-16Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds1143-37918/+119131
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits) bonding: enable netpoll without checking link status xfrm: Refcount destination entry on xfrm_lookup net: introduce rx_handler results and logic around that bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag bonding: wrap slave state work net: get rid of multiple bond-related netdevice->priv_flags bonding: register slave pointer for rx_handler be2net: Bump up the version number be2net: Copyright notice change. Update to Emulex instead of ServerEngines e1000e: fix kconfig for crc32 dependency netfilter ebtables: fix xt_AUDIT to work with ebtables xen network backend driver bonding: Improve syslog message at device creation time bonding: Call netif_carrier_off after register_netdevice bonding: Incorrect TX queue offset net_sched: fix ip_tos2prio xfrm: fix __xfrm_route_forward() be2net: Fix UDP packet detected status in RX compl Phonet: fix aligned-mode pipe socket buffer header reserve netxen: support for GbE port settings ... Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c with the staging updates.
2011-03-16Merge branch 'staging-next' of ↵Linus Torvalds835-87750/+91150
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (961 commits) staging: hv: fix memory leaks staging: hv: Remove NULL check before kfree Staging: hv: Get rid of vmbus_child_dev_add() Staging: hv: Change the signature for vmbus_child_device_register() Staging: hv: Get rid of vmbus_cleanup() function Staging: hv: Get rid of vmbus_dev_rm() function Staging: hv: Change the signature for vmbus_on_isr() Staging: hv: Eliminate vmbus_event_dpc() Staging: hv: Get rid of the function vmbus_msg_dpc() Staging: hv: Change the signature for vmbus_cleanup() Staging: hv: Simplify root device management staging: rtl8192e: Don't copy dev pointer to skb staging: rtl8192e: Pass priv to cmdpkt functions staging: rtl8192e: Pass priv to firmware download functions staging: rtl8192e: Pass priv to rtl8192_interrupt staging: rtl8192e: Pass rtl8192_priv to dm functions staging: rtl8192e: Pass ieee80211_device to callbacks staging: rtl8192e: Pass ieee80211_device to callbacks staging: rtl8192e: Pass ieee80211_device to callbacks staging: rtl8192e: Pass ieee80211_device to callbacks ...
2011-03-16Merge branch 'tty-next' of ↵Linus Torvalds222-1357/+3925
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits) pch_uart: reference clock on CM-iTC pch_phub: add new device ML7213 n_gsm: fix UIH control byte : P bit should be 0 n_gsm: add a documentation serial: msm_serial_hs: Add MSM high speed UART driver tty_audit: fix tty_audit_add_data live lock on audit disabled tty: move cd1865.h to drivers/staging/tty/ Staging: tty: fix build with epca.c driver pcmcia: synclink_cs: fix prototype for mgslpc_ioctl() Staging: generic_serial: fix double locking bug nozomi: don't use flush_scheduled_work() tty/serial: Relax the device_type restriction from of_serial MAINTAINERS: Update HVC file patterns tty: phase out of ioctl file pointer for tty3270 as well tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile pch_uart: Fix DMA channel miss-setting issue. pch_uart: fix exclusive access issue pch_uart: fix auto flow control miss-setting issue pch_uart: fix uart clock setting issue pch_uart : Use dev_xxx not pr_xxx ... Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied twice, then changes to the same area in one branch)
2011-03-16Merge branch 'driver-core-next' of ↵Linus Torvalds44-913/+2890
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (50 commits) printk: do not mangle valid userspace syslog prefixes efivars: Add Documentation efivars: Expose efivars functionality to external drivers. efivars: Parameterize operations. efivars: Split out variable registration efivars: parameterize efivars efivars: Make efivars bin_attributes dynamic efivars: move efivars globals into struct efivars drivers:misc: ti-st: fix debugging code kref: Fix typo in kref documentation UIO: add PRUSS UIO driver support Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches firmware: Fix unaligned memory accesses in dmi-sysfs firmware: Add documentation for /sys/firmware/dmi firmware: Expose DMI type 15 System Event Log firmware: Break out system_event_log in dmi-sysfs firmware: Basic dmi-sysfs support firmware: Add DMI entry types to the headers Driver core: convert platform_{get,set}_drvdata to static inline functions Translate linux-2.6/Documentation/magic-number.txt into Chinese ...
2011-03-16Merge branch 'usb-next' of ↵Linus Torvalds167-4051/+10850
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits) USB: Add support for SuperSpeed isoc endpoints xhci: Clean up cycle bit math used during stalls. xhci: Fix cycle bit calculation during stall handling. xhci: Update internal dequeue pointers after stalls. USB: Disable auto-suspend for USB 3.0 hubs. USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol. xhci: Return canceled URBs immediately when host is halted. xhci: Fixes for suspend/resume of shared HCDs. xhci: Fix re-init on power loss after resume. xhci: Make roothub functions deal with device removal. xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports. xhci: Return a USB 3.0 hub descriptor for USB3 roothub. xhci: Register second xHCI roothub. xhci: Change xhci_find_slot_id_by_port() API. xhci: Refactor bus suspend state into a struct. xhci: Index with a port array instead of PORTSC addresses. USB: Set usb_hcd->state and flags for shared roothubs. usb: Make core allocate resources per PCI-device. usb: Store bus type in usb_hcd, not in driver flags. usb: Change usb_hcd->bandwidth_mutex to a pointer. ...
2011-03-16[CPUFREQ] pcc-cpufreq: remove duplicate statementsChumbalkar, Nagananda1-2/+0
Remove a couple of assigment statements that appear twice. Signed-off-by: Naga Chumbalkar <[email protected]> Signed-off-by: Dave Jones <[email protected]>
2011-03-16[CPUFREQ] Remove the pm_message_t argument from driver suspendRafael J. Wysocki6-8/+6
None of the existing cpufreq drivers uses the second argument of its .suspend() callback (which isn't useful anyway), so remove it. Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Dave Jones <[email protected]>
2011-03-16[CPUFREQ] Remove unneeded locksThomas Renninger2-53/+6
There cannot be any concurrent access to these through different cpu sysfs files anymore, because these tunables are now all global (not per cpu). I still have some doubts whether some of these locks were needed at all. Anyway, let's get rid of them. Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Dave Jones <[email protected]> CC: [email protected]
2011-03-16[CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs filesThomas Renninger3-150/+0
Marked deprecated for quite a whilte now... Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Dave Jones <[email protected]> CC: [email protected]
2011-03-16[CPUFREQ] Remove deprecated sysfs file sampling_rate_maxThomas Renninger2-26/+0
Marked deprecated for quite a while now... Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Dave Jones <[email protected]> CC: [email protected]
2011-03-16[CPUFREQ] powernow-k8: The table index is not worth displayingThomas Renninger1-2/+1
and it also is misleading due to another message above which makes the index look like it is the CPU. https://bugzilla.kernel.org/show_bug.cgi?id=24562 Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Dave Jones <[email protected]> CC: [email protected]
2011-03-16[CPUFREQ] calculate delay after dbs_check_cpuVincent Guittot1-6/+11
calculate ondemand delay after dbs_check_cpu call because it can modify rate_mult value use freq_lo_jiffies value for the sub sample period of powersave_bias mode Signed-off-by: Vincent Guittot <[email protected]> Signed-off-by: Dave Jones <[email protected]>