mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits) x86: delete vsyscall files during make clean kbuild: fix typo SRCARCH in find_sources x86: fix kernel rebuild due to vsyscall fallout .gitignore update for x86 arch x86: unify include/asm/debugreg_32/64.h x86: unify include/asm/unwind_32/64.h x86: unify include/asm/types_32/64.h x86: unify include/asm/tlb_32/64.h x86: unify include/asm/siginfo_32/64.h x86: unify include/asm/bug_32/64.h x86: unify include/asm/mman_32/64.h x86: unify include/asm/agp_32/64.h x86: unify include/asm/kdebug_32/64.h x86: unify include/asm/ioctls_32/64.h x86: unify include/asm/floppy_32/64.h x86: apply missing DMA/OOM prevention to floppy_32.h x86: unify include/asm/cache_32/64.h x86: unify include/asm/cache_32/64.h x86: unify include/asm/dmi_32/64.h x86: unify include/asm/delay_32/64.h ...
This commit is contained in:
commit
d20ead9e86
252 changed files with 2688 additions and 4294 deletions
|
|
@ -221,7 +221,7 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
|
|||
SetPageReserved(virt_to_page((char *)page));
|
||||
|
||||
for (offset = 0; offset < PAGE_SIZE; offset += clflush_chunk)
|
||||
asm volatile("clflush %0" : : "m" (*(char *)(page+offset)));
|
||||
clflush((char *)page+offset);
|
||||
|
||||
efficeon_private.l1_table[index] = page;
|
||||
|
||||
|
|
@ -268,15 +268,16 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t
|
|||
*page = insert;
|
||||
|
||||
/* clflush is slow, so don't clflush until we have to */
|
||||
if ( last_page &&
|
||||
((unsigned long)page^(unsigned long)last_page) & clflush_mask )
|
||||
asm volatile("clflush %0" : : "m" (*last_page));
|
||||
if (last_page &&
|
||||
(((unsigned long)page^(unsigned long)last_page) &
|
||||
clflush_mask))
|
||||
clflush(last_page);
|
||||
|
||||
last_page = page;
|
||||
}
|
||||
|
||||
if ( last_page )
|
||||
asm volatile("clflush %0" : : "m" (*last_page));
|
||||
clflush(last_page);
|
||||
|
||||
agp_bridge->driver->tlb_flush(mem);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ config VGASTATE
|
|||
|
||||
config VIDEO_OUTPUT_CONTROL
|
||||
tristate "Lowlevel video output switch controls"
|
||||
default m
|
||||
help
|
||||
This framework adds support for low-level control of the video
|
||||
output switch.
|
||||
|
|
|
|||
Loading…
Reference in a new issue