diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 08:40:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 08:40:19 -0700 |
| commit | 1c89ac55017f982355c7761e1c912c88c941483d (patch) | |
| tree | 6878e95a0572defc725ea58f5a1449db937a5066 /arch/x86 | |
| parent | 88fa08f67bee1a0c765237bdac106a32872f57d2 (diff) | |
| parent | b1b135c8d619cb2c7045d6ee4e48375882518bb5 (diff) | |
| download | op-kernel-dev-1c89ac55017f982355c7761e1c912c88c941483d.zip op-kernel-dev-1c89ac55017f982355c7761e1c912c88c941483d.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
fix spinlock recursion in hvc_console
stop_machine: remove unused variable
modules: extend initcall_debug functionality to the module loader
export virtio_rng.h
lguest: use get_user_pages_fast() instead of get_user_pages()
mm: Make generic weak get_user_pages_fast and EXPORT_GPL it
lguest: don't set MAC address for guest unless specified
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/mm/Makefile | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3d0f2b6..ac2fb06 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -22,7 +22,6 @@ config X86 select HAVE_IDE select HAVE_OPROFILE select HAVE_IOREMAP_PROT - select HAVE_GET_USER_PAGES_FAST select HAVE_KPROBES select ARCH_WANT_OPTIONAL_GPIOLIB select HAVE_KRETPROBES diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 2977ea3..dfb932d 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -1,7 +1,6 @@ obj-y := init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \ - pat.o pgtable.o + pat.o pgtable.o gup.o -obj-$(CONFIG_HAVE_GET_USER_PAGES_FAST) += gup.o obj-$(CONFIG_X86_32) += pgtable_32.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o |
