diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 17:27:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 17:27:39 -0500 |
| commit | 35010334aa007480a833401b80922299cb1a15ef (patch) | |
| tree | 6e318eb89da45d37ea8dceddd1ae6858b74dee1e /include | |
| parent | 8ce9a75a307e142a8871c649627555e0e4a1eefb (diff) | |
| parent | be716615fe596ee117292dc615e95f707fb67fd1 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, vm86: fix preemption bug
x86, olpc: fix model detection without OFW
x86, hpet: fix for LS21 + HPET = boot hang
x86: CPA avoid repeated lazy mmu flush
x86: warn if arch_flush_lazy_mmu_cpu is called in preemptible context
x86/paravirt: make arch_flush_lazy_mmu/cpu disable preemption
x86, pat: fix warn_on_once() while mapping 0-1MB range with /dev/mem
x86/cpa: make sure cpa is safe to call in lazy mmu mode
x86, ptrace, mm: fix double-free on race
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 323561582c10..7dc04ff5ab89 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -1304,5 +1304,6 @@ void vmemmap_populate_print_last(void); | |||
| 1304 | 1304 | ||
| 1305 | extern void *alloc_locked_buffer(size_t size); | 1305 | extern void *alloc_locked_buffer(size_t size); |
| 1306 | extern void free_locked_buffer(void *buffer, size_t size); | 1306 | extern void free_locked_buffer(void *buffer, size_t size); |
| 1307 | extern void release_locked_buffer(void *buffer, size_t size); | ||
| 1307 | #endif /* __KERNEL__ */ | 1308 | #endif /* __KERNEL__ */ |
| 1308 | #endif /* _LINUX_MM_H */ | 1309 | #endif /* _LINUX_MM_H */ |