diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 12:16:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 12:16:03 -0500 |
| commit | d2fc0bacd5c438cb459fdf531eff00ab18422a00 (patch) | |
| tree | d0ea52e4d2ad2fac12e19eaf6891c6af98353cfc /include/asm-x86/uaccess_32.h | |
| parent | 93890b71a34f9490673a6edd56b61c2124215e46 (diff) | |
| parent | 795d45b22c079946332bf3825afefe5a981a97b6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (78 commits)
x86: fix RTC lockdep warning: potential hardirq recursion
x86: cpa, micro-optimization
x86: cpa, clean up code flow
x86: cpa, eliminate CPA_ enum
x86: cpa, cleanups
x86: implement gbpages support in change_page_attr()
x86: support gbpages in pagetable dump
x86: add gbpages support to lookup_address
x86: add pgtable accessor functions for gbpages
x86: add PUD_PAGE_SIZE
x86: add feature macros for the gbpages cpuid bit
x86: switch direct mapping setup over to set_pte
x86: fix page-present check in cpa_flush_range
x86: remove cpa warning
x86: remove now unused clear_kernel_mapping
x86: switch pci-gart over to using set_memory_np() instead of clear_kernel_mapping()
x86: cpa selftest, skip non present entries
x86: CPA fix pagetable split
x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE
x86: cpa, fix lookup_address
...
Diffstat (limited to 'include/asm-x86/uaccess_32.h')
| -rw-r--r-- | include/asm-x86/uaccess_32.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/include/asm-x86/uaccess_32.h b/include/asm-x86/uaccess_32.h index d2a4f7be9c2c..fcc570ec4fee 100644 --- a/include/asm-x86/uaccess_32.h +++ b/include/asm-x86/uaccess_32.h | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/thread_info.h> | 8 | #include <linux/thread_info.h> |
| 9 | #include <linux/prefetch.h> | 9 | #include <linux/prefetch.h> |
| 10 | #include <linux/string.h> | 10 | #include <linux/string.h> |
| 11 | #include <asm/asm.h> | ||
| 11 | #include <asm/page.h> | 12 | #include <asm/page.h> |
| 12 | 13 | ||
| 13 | #define VERIFY_READ 0 | 14 | #define VERIFY_READ 0 |
| @@ -287,11 +288,8 @@ extern void __put_user_8(void); | |||
| 287 | "4: movl %3,%0\n" \ | 288 | "4: movl %3,%0\n" \ |
| 288 | " jmp 3b\n" \ | 289 | " jmp 3b\n" \ |
| 289 | ".previous\n" \ | 290 | ".previous\n" \ |
| 290 | ".section __ex_table,\"a\"\n" \ | 291 | _ASM_EXTABLE(1b,4b) \ |
| 291 | " .align 4\n" \ | 292 | _ASM_EXTABLE(2b,4b) \ |
| 292 | " .long 1b,4b\n" \ | ||
| 293 | " .long 2b,4b\n" \ | ||
| 294 | ".previous" \ | ||
| 295 | : "=r"(err) \ | 293 | : "=r"(err) \ |
| 296 | : "A" (x), "r" (addr), "i"(-EFAULT), "0"(err)) | 294 | : "A" (x), "r" (addr), "i"(-EFAULT), "0"(err)) |
| 297 | 295 | ||
| @@ -338,10 +336,7 @@ struct __large_struct { unsigned long buf[100]; }; | |||
| 338 | "3: movl %3,%0\n" \ | 336 | "3: movl %3,%0\n" \ |
| 339 | " jmp 2b\n" \ | 337 | " jmp 2b\n" \ |
| 340 | ".previous\n" \ | 338 | ".previous\n" \ |
| 341 | ".section __ex_table,\"a\"\n" \ | 339 | _ASM_EXTABLE(1b,3b) \ |
| 342 | " .align 4\n" \ | ||
| 343 | " .long 1b,3b\n" \ | ||
| 344 | ".previous" \ | ||
| 345 | : "=r"(err) \ | 340 | : "=r"(err) \ |
| 346 | : ltype (x), "m"(__m(addr)), "i"(errret), "0"(err)) | 341 | : ltype (x), "m"(__m(addr)), "i"(errret), "0"(err)) |
| 347 | 342 | ||
| @@ -378,10 +373,7 @@ do { \ | |||
| 378 | " xor"itype" %"rtype"1,%"rtype"1\n" \ | 373 | " xor"itype" %"rtype"1,%"rtype"1\n" \ |
| 379 | " jmp 2b\n" \ | 374 | " jmp 2b\n" \ |
| 380 | ".previous\n" \ | 375 | ".previous\n" \ |
| 381 | ".section __ex_table,\"a\"\n" \ | 376 | _ASM_EXTABLE(1b,3b) \ |
| 382 | " .align 4\n" \ | ||
| 383 | " .long 1b,3b\n" \ | ||
| 384 | ".previous" \ | ||
| 385 | : "=r"(err), ltype (x) \ | 377 | : "=r"(err), ltype (x) \ |
| 386 | : "m"(__m(addr)), "i"(errret), "0"(err)) | 378 | : "m"(__m(addr)), "i"(errret), "0"(err)) |
| 387 | 379 | ||