aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-04-02sh: export return_address() symbol.Paul Mundt1-0/+3
This is needed with some of the tracing code built as modules, so provide the export. Signed-off-by: Paul Mundt <[email protected]>
2010-04-01Merge branch 'drm-linus' of ↵Linus Torvalds76-1676/+2904
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (76 commits) drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus. drm/radeon/kms: rs400/480 should set common registers. drm/radeon/kms: add sanity check to wptr. drm/radeon/kms/evergreen: get DP working drm/radeon/kms: add hw_i2c module option drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks drm/radeon/kms: disable MSI on IGP chips drm/radeon/kms: display watermark updates (v2) drm/radeon/kms/dp: disable training pattern on the sink at the end of link training drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2) drm/radeon/kms/dp: remove extraneous training complete call drm/radeon/kms/atom: minor fixes to transmitter setup drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM. drm: fix build error when SYSRQ is disabled drm/radeon/kms: fix macbookpro connector quirk drm/radeon/r6xx/r7xx: further safe reg clean up drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support drm/radeon/kms: bump the version for r6xx/r7xx const buffer support drm/radeon/r6xx/r7xx: CS parser fixes drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup ... Fix up MSI-related conflicts in drivers/gpu/drm/radeon/radeon_irq_kms.c
2010-04-01Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds24-446/+407
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (35 commits) microblaze: Support word copying in copy_tofrom_user microblaze: Print early printk information to log buffer microblaze: head.S typo fix microblaze: Use MICROBLAZE_TLB_SIZE in asm code microblaze: Kconfig Fix - pci microblaze: Adding likely macros microblaze: Add .type and .size to ASM functions microblaze: Fix TLB macros microblaze: Use instruction with delay slot microblaze: Remove additional resr and rear loading microblaze: Change register usage for ESR and EAR microblaze: Prepare work for optimization in exception code microblaze: Add DEBUG option microblaze: Support systems without lmb bram microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user microblaze: uaccess: Unify __copy_tofrom_user microblaze: uaccess: Move functions to generic location microblaze: uaccess: Fix put_user for noMMU microblaze: uaccess: Fix get_user macro for noMMU microblaze: uaccess: fix clear_user for noMMU kernel ...
2010-04-01Merge branch 'for_linus' of ↵Linus Torvalds4-2/+170
git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops asus-laptop: fix warning in asus_handle_init
2010-04-01oom: fix the unsafe usage of badness() in proc_oom_score()Oleg Nesterov1-2/+3
proc_oom_score(task) has a reference to task_struct, but that is all. If this task was already released before we take tasklist_lock - we can't use task->group_leader, it points to nowhere - it is not safe to call badness() even if this task is ->group_leader, has_intersects_mems_allowed() assumes it is safe to iterate over ->thread_group list. - even worse, badness() can hit ->signal == NULL Add the pid_alive() check to ensure __unhash_process() was not called. Also, use "task" instead of task->group_leader. badness() should return the same result for any sub-thread. Currently this is not true, but this should be changed anyway. Signed-off-by: Oleg Nesterov <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2010-04-01microblaze: Support word copying in copy_tofrom_userMichal Simek1-14/+25
Word copying is used only for aligned addresses. Here is space for improving to use any better copying technique. Look at memcpy implementation. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Print early printk information to log bufferMichal Simek1-9/+15
If early printk console is not enabled then all messages are written to log buffer. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: head.S typo fixMichal Simek1-2/+2
I forget to change register name in comments. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Use MICROBLAZE_TLB_SIZE in asm codeMichal Simek2-3/+3
TLB size was hardcoded in asm code. This patch brings ability to change TLB size only in one place. (mmu.h). Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Kconfig Fix - pciMichal Simek1-3/+0
I forget to remove pci Kconfig option. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Adding likely macrosMichal Simek6-26/+28
On the base on GCOV analytics is helpful to add likely/unlikely macros. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Add .type and .size to ASM functionsMichal Simek3-1/+22
Cachegrind analysis need this fix to be able to log asm functions. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Fix TLB macrosMichal Simek1-1/+2
To be able to do trace TLB operations. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Use instruction with delay slotMichal Simek1-8/+5
Sync labels. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Remove additional resr and rear loadingMichal Simek1-15/+3
RESR and REAR uses the same regs in whole file. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Change register usage for ESR and EARMichal Simek1-35/+35
This change synchronize register usage in code. ESR = R4 EAR = R3 Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Prepare work for optimization in exception codeMichal Simek1-6/+3
Any sync branch must follow mts instructions not mfs. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Add DEBUG optionMichal Simek1-0/+2
Disable debug option in asm code. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Support systems without lmb bramMichal Simek1-0/+6
When the system has no lmb bram, main memory should be start from zero because of microblaze vectors. DTS fragment could look like: DDR2_SDRAM: memory@0 { device_type = "memory"; reg = < 0x0 0x10000000 >; } ; Then you have to setup CONFIG_KERNEL_BASE_ADDR=0 which caused that kernel physical start address will be zero. On reset vector place will be jump to 0x100 and on 0x100 starts kernel text. You have to solve how to load the kernel before cpu starts. Tested with XMD. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: Sync strlen, strnlen, copy_to/from_userMichal Simek1-56/+32
Last sync. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: Unify __copy_tofrom_userMichal Simek2-39/+22
Move to generic location. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: Move functions to generic locationMichal Simek3-200/+61
noMMU and MMU use them. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: Fix put_user for noMMUMichal Simek1-22/+56
Here is small regression on dhrystone tests and I think that on all benchmarking tests. It is due to better checking mechanism in put_user macro Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: Fix get_user macro for noMMUMichal Simek1-23/+66
Use unified version. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: fix clear_user for noMMU kernelMichal Simek1-45/+36
Previous patches fixed only MMU version and this is the first patch for noMMU kernel Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: Fix strncpy_from_user functionMichal Simek1-3/+11
Generic implementation for noMMU and MMU version Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: fix copy_from_user macroMichal Simek1-9/+14
copy_from_user macro also use copy_tofrom_user function Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: copy_to_user unificationMichal Simek1-9/+16
noMMU and MMU kernel will use copy copy_tofrom_user asm implementation. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: sync put/get/clear_user macrosMichal Simek1-37/+69
Add macro description and resort. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: fix put_user and get_user macrosMichal Simek1-51/+49
Use FIXUP macros and resort them. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: fix __get_user_asm macroMichal Simek1-16/+17
It is used __FIXUP_SECTION and __EX_TABLE_SECTION macros. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: uaccess: fix clean user macroMichal Simek1-34/+55
This is the first patch which does uaccess unification. I choosed to do several patches to be able to use bisect in future if any fault happens. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: move noMMU __range_ok function to uaccess.hMichal Simek2-9/+6
The same noMMU and MMU functions should be placed in one file. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Move exception_table_entry upwardMichal Simek1-16/+15
Just sort to be able remove whole block. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Remove segment.hMichal Simek5-52/+34
I would like to use asm-generic uaccess.h where are segment macros defined. This is just first step. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Remove memset in free_init_pagesMichal Simek1-1/+0
We don't need to do it. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Makefile cleanupsArun Bhanu1-4/+0
If CONFIG_INITRAMFS_SOURCE is set, "scripts/gen_initramfs_list.sh" checks if the cpio image exists. Remove the duplicate check from the Makefile. Remove the "clean-kernel" variable which is unused in the Makefile and is not used by the Kbuild. Signed-off-by: Arun Bhanu <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Fix Makefile to delete build generated filesArun Bhanu2-1/+3
'make clean' does not to delete the following build generated file: arch/microblaze/boot/linux.bin.ub 'make mrproper' does not to delete the following build generated files: arch/microblaze/boot/simpleImage.* Fix the Makefile to delete these build generated files. See [1] for a discussion on why simpleImage.* files are deleted with 'make mrproper' and not with 'make clean'. [1] http://lkml.org/lkml/2010/3/12/96 Signed-off-by: Arun Bhanu <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Add a missing single quote to make 'make help' happyArun Bhanu1-1/+1
'make ARCH=microblaze help' fails with the following error due to a missing single quote. /bin/sh: -c: line 0: unexpected EOF while looking for matching `'' /bin/sh: -c: line 1: syntax error: unexpected end of file make: *** [help] Error 2 Signed-off-by: Arun Bhanu <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Fix "kstack=" parsingSteven J. Magnani1-4/+2
The "kstack=" command line parameter is not parsed correctly. All proper values are interpreted as zero. Signed-off-by: Steven J. Magnani <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-04-01x86,kgdb: Always initialize the hw breakpoint attributeJason Wessel1-1/+1
It is required to call hw_breakpoint_init() on an attr before using it in any other calls. This fixes the problem where kgdb will sometimes fail to initialize on x86_64. Signed-off-by: Jason Wessel <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: 2.6.33 <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Frederic Weisbecker <[email protected]>
2010-04-01perf: Use hot regs with software sched switch/migrate eventsFrederic Weisbecker3-12/+15
Scheduler's task migration events don't work because they always pass NULL regs perf_sw_event(). The event hence gets filtered in perf_swevent_add(). Scheduler's context switches events use task_pt_regs() to get the context when the event occured which is a wrong thing to do as this won't give us the place in the kernel where we went to sleep but the place where we left userspace. The result is even more wrong if we switch from a kernel thread. Use the hot regs snapshot for both events as they belong to the non-interrupt/exception based events family. Unlike page faults or so that provide the regs matching the exact origin of the event, we need to save the current context. This makes the task migration event working and fix the context switch callchains and origin ip. Example: perf record -a -e cs Before: 10.91% ksoftirqd/0 0 [k] 0000000000000000 | --- (nil) perf_callchain perf_prepare_sample __perf_event_overflow perf_swevent_overflow perf_swevent_add perf_swevent_ctx_event do_perf_sw_event __perf_sw_event perf_event_task_sched_out schedule run_ksoftirqd kthread kernel_thread_helper After: 23.77% hald-addon-stor [kernel.kallsyms] [k] schedule | --- schedule | |--60.00%-- schedule_timeout | wait_for_common | wait_for_completion | blk_execute_rq | scsi_execute | scsi_execute_req | sr_test_unit_ready | | | |--66.67%-- sr_media_change | | media_changed | | cdrom_media_changed | | sr_block_media_changed | | check_disk_change | | cdrom_open v2: Always build perf_arch_fetch_caller_regs() now that software events need that too. They don't need it from modules, unlike trace events, so we keep the EXPORT_SYMBOL in trace_event_perf.c Signed-off-by: Frederic Weisbecker <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: David Miller <[email protected]>
2010-04-01perf: Correctly align perf event tracing bufferFrederic Weisbecker1-2/+9
The trace event buffer used by perf to record raw sample events is typed as an array of char and may then not be aligned to 8 by alloc_percpu(). But we need it to be aligned to 8 in sparc64 because we cast this buffer into a random structure type built by the TRACE_EVENT() macro to store the traces. So if a random 64 bits field is accessed inside, it may be not under an expected good alignment. Use an array of long instead to force the appropriate alignment, and perform a compile time check to ensure the size in byte of the buffer is a multiple of sizeof(long) so that its actual size doesn't get shrinked under us. This fixes unaligned accesses reported while using perf lock in sparc 64. Suggested-by: David Miller <[email protected]> Suggested-by: Tejun Heo <[email protected]> Signed-off-by: Frederic Weisbecker <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: David Miller <[email protected]> Cc: Steven Rostedt <[email protected]>
2010-04-01drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.Dave Airlie2-0/+8
Some GPUs have an APM/ACPI PM mode selection switch and some BIOSes set this to APM. We really want this in ACPI mode for Linux. Signed-off-by: Dave Airlie <[email protected]>
2010-04-01drm/radeon/kms: rs400/480 should set common registers.Dave Airlie1-0/+2
These GPUs should be setting these registers up also. Signed-off-by: Dave Airlie <[email protected]>
2010-04-01drm/radeon/kms: add sanity check to wptr.Dave Airlie1-0/+2
If we resume in a bad way, we'll get 0xffffffff in wptr, and then oops with no console. This just adds a sanity check so that we can avoid the oops and hopefully get more details out of people's systems. Signed-off-by: Dave Airlie <[email protected]>
2010-04-01drm/radeon/kms/evergreen: get DP workingAlex Deucher1-3/+12
Need to enable the VID stream after link training Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31sparc: Fix regset register window handling.David S. Miller2-0/+8
We have to adjust 'reg_window' down by 16 becuase the 'pos' iterator we'll use to index into the stack slots will be between 16 and 32. Signed-off-by: David S. Miller <[email protected]>
2010-03-31eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptopsYong Wang3-0/+168
Add a WMI driver for Eee PC laptops. Currently it only supports hotkeys. Signed-off-by: Yong Wang <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Acked-by: Dmitry Torokhov <[email protected]>
2010-03-31asus-laptop: fix warning in asus_handle_initCorentin Chary1-2/+2
In function 'asus_laptop_get_info': warning: passing argument 3 of 'asus_handle_init' from incompatible pointer type note: expected 'char **' but argument is of type 'const char **' Introduced by commit c21085108a02e1b838c34f3650c8cc9fbd178615 ("asus-laptop: fix style problems reported by checkpath.pl"). Signed-off-by: Corentin Chary <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.