diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 14:26:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 14:26:48 -0400 |
| commit | 84eda28060f7e7d5f91f81f928532af13b9e44b2 (patch) | |
| tree | f0b7feeca9b6a21a43f279fb3b566eef1c16584d /arch/frv/mm/highmem.c | |
| parent | b387e41e523c1aa347cff055455d0dd129357df4 (diff) | |
| parent | 2164d3344693d2d4799fe91836d61f55516cbdf0 (diff) | |
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/frv/mm/highmem.c')
| -rw-r--r-- | arch/frv/mm/highmem.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/frv/mm/highmem.c b/arch/frv/mm/highmem.c index 31902c9d5be5..bed9a9bd3c10 100644 --- a/arch/frv/mm/highmem.c +++ b/arch/frv/mm/highmem.c | |||
| @@ -50,11 +50,11 @@ void *kmap_atomic(struct page *page) | |||
| 50 | /* | 50 | /* |
| 51 | * The first 4 primary maps are reserved for architecture code | 51 | * The first 4 primary maps are reserved for architecture code |
| 52 | */ | 52 | */ |
| 53 | case 0: return __kmap_atomic_primary(4, paddr, 6); | 53 | case 0: return __kmap_atomic_primary(0, paddr, 6); |
| 54 | case 1: return __kmap_atomic_primary(5, paddr, 7); | 54 | case 1: return __kmap_atomic_primary(0, paddr, 7); |
| 55 | case 2: return __kmap_atomic_primary(6, paddr, 8); | 55 | case 2: return __kmap_atomic_primary(0, paddr, 8); |
| 56 | case 3: return __kmap_atomic_primary(7, paddr, 9); | 56 | case 3: return __kmap_atomic_primary(0, paddr, 9); |
| 57 | case 4: return __kmap_atomic_primary(8, paddr, 10); | 57 | case 4: return __kmap_atomic_primary(0, paddr, 10); |
| 58 | 58 | ||
| 59 | case 5 ... 5 + NR_TLB_LINES - 1: | 59 | case 5 ... 5 + NR_TLB_LINES - 1: |
| 60 | return __kmap_atomic_secondary(type - 5, paddr); | 60 | return __kmap_atomic_secondary(type - 5, paddr); |
| @@ -70,11 +70,11 @@ void __kunmap_atomic(void *kvaddr) | |||
| 70 | { | 70 | { |
| 71 | int type = kmap_atomic_idx(); | 71 | int type = kmap_atomic_idx(); |
| 72 | switch (type) { | 72 | switch (type) { |
| 73 | case 0: __kunmap_atomic_primary(4, 6); break; | 73 | case 0: __kunmap_atomic_primary(0, 6); break; |
| 74 | case 1: __kunmap_atomic_primary(5, 7); break; | 74 | case 1: __kunmap_atomic_primary(0, 7); break; |
| 75 | case 2: __kunmap_atomic_primary(6, 8); break; | 75 | case 2: __kunmap_atomic_primary(0, 8); break; |
| 76 | case 3: __kunmap_atomic_primary(7, 9); break; | 76 | case 3: __kunmap_atomic_primary(0, 9); break; |
| 77 | case 4: __kunmap_atomic_primary(8, 10); break; | 77 | case 4: __kunmap_atomic_primary(0, 10); break; |
| 78 | 78 | ||
| 79 | case 5 ... 5 + NR_TLB_LINES - 1: | 79 | case 5 ... 5 + NR_TLB_LINES - 1: |
| 80 | __kunmap_atomic_secondary(type - 5, kvaddr); | 80 | __kunmap_atomic_secondary(type - 5, kvaddr); |