diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 11:26:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 11:26:48 -0700 |
commit | 84eda28060f7e7d5f91f81f928532af13b9e44b2 (patch) | |
tree | f0b7feeca9b6a21a43f279fb3b566eef1c16584d /arch/tile/mm | |
parent | b387e41e523c1aa347cff055455d0dd129357df4 (diff) | |
parent | 2164d3344693d2d4799fe91836d61f55516cbdf0 (diff) | |
download | op-kernel-dev-84eda28060f7e7d5f91f81f928532af13b9e44b2.zip op-kernel-dev-84eda28060f7e7d5f91f81f928532af13b9e44b2.tar.gz |
Merge branch 'kmap_atomic' of git://github.com/congwang/linux
Pull final kmap_atomic cleanups from Cong Wang:
"This should be the final round of cleanup, as the definitions of enum
km_type finally get removed from the whole tree. The patches have
been in linux-next for a long time."
* 'kmap_atomic' of git://github.com/congwang/linux:
pipe: remove KM_USER0 from comments
vmalloc: remove KM_USER0 from comments
feature-removal-schedule.txt: remove kmap_atomic(page, km_type)
tile: remove km_type definitions
um: remove km_type definitions
asm-generic: remove km_type definitions
avr32: remove km_type definitions
frv: remove km_type definitions
powerpc: remove km_type definitions
arm: remove km_type definitions
highmem: remove the deprecated form of kmap_atomic
tile: remove usage of enum km_type
frv: remove the second parameter of kmap_atomic_primary()
jbd2: remove the second argument of kmap_atomic
Diffstat (limited to 'arch/tile/mm')
-rw-r--r-- | arch/tile/mm/highmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c index ef8e5a6..347d123 100644 --- a/arch/tile/mm/highmem.c +++ b/arch/tile/mm/highmem.c @@ -93,7 +93,7 @@ static DEFINE_PER_CPU(struct kmap_amps, amps); * If we examine it earlier we are exposed to a race where it looks * writable earlier, but becomes immutable before we write the PTE. */ -static void kmap_atomic_register(struct page *page, enum km_type type, +static void kmap_atomic_register(struct page *page, int type, unsigned long va, pte_t *ptep, pte_t pteval) { unsigned long flags; |