kernel.git/arch/x86/include/asm/cacheflush.h, branch linux-2.6.30.y

Merge branch 'tracing/core-v2' into tracing-for-linus

2009-04-01T22:49:02Z

Conflicts: include/linux/slub_def.h lib/Kconfig.debug mm/slob.c mm/slub.c

x86, CPA: Add set_pages_arrayuc and set_pages_array_wb

2009-03-20T09:34:49Z

Add new interfaces: set_pages_array_uc() set_pages_array_wb() that can be used change the page attribute for a bunch of pages with flush etc done once at the end of all the changes. These interfaces are similar to existing set_memory_array_uc() and set_memory_array_wc(). Signed-off-by: Venkatesh Pallipadi Cc: arjan@infradead.org Cc: eric@anholt.net Cc: airlied@redhat.com LKML-Reference: <20090319215358.901545000@intel.com> Signed-off-by: Ingo Molnar

Merge branch 'x86/core' into tracing/textedit

2009-03-06T15:45:01Z

Conflicts: arch/x86/Kconfig block/blktrace.c kernel/irq/handle.c Semantic conflict: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar

x86: convert cacheflush macros inline functions

2009-02-25T02:06:51Z

Impact: cleanup Unused macro parameters cause spurious unused variable warnings. Convert all cacheflush macros to inline functions to avoid the warnings and achieve better type checking. Signed-off-by: Tejun Heo

ftrace, x86: make kernel text writable only for conversions

2009-02-20T19:30:06Z

Impact: keep kernel text read only Because dynamic ftrace converts the calls to mcount into and out of nops at run time, we needed to always keep the kernel text writable. But this defeats the point of CONFIG_DEBUG_RODATA. This patch converts the kernel code to writable before ftrace modifies the text, and converts it back to read only afterward. The kernel text is converted to read/write, stop_machine is called to modify the code, then the kernel text is converted back to read only. The original version used SYSTEM_STATE to determine when it was OK or not to change the code to rw or ro. Andrew Morton pointed out that using SYSTEM_STATE is a bad idea since there is no guarantee to what its state will actually be. Instead, I moved the check into the set_kernel_text_* functions themselves, and use a local variable to determine when it is OK to change the kernel text RW permissions. [ Update: Ingo Molnar suggested moving the prototypes to cacheflush.h ] Reviewed-by: Andrew Morton Signed-off-by: Steven Rostedt

x86: Fix ASM_X86__ header guards

2008-10-23T05:55:23Z

Change header guards named "ASM_X86__*" to "_ASM_X86_*" since: a. the double underscore is ugly and pointless. b. no leading underscore violates namespace constraints. Signed-off-by: H. Peter Anvin

x86, um: ... and asm-x86 move

2008-10-23T05:55:20Z

Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin