Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 75babcacede876608f14ef1a20e795ce17ae637f

Authored by Eric Sesterhenn
Committed by Adrian Bunk
1 parent 9f31252cb6
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

BUG_ON() Conversion in mm/highmem.c 

this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

Showing 1 changed file with 5 additions and 10 deletions Side-by-side Diff

... ... @@ -74,8 +74,7 @@
74 74 pkmap_count[i] = 0;
75 75  
76 76 /* sanity check */
77   - if (pte_none(pkmap_page_table[i]))
78   - BUG();
  77 + BUG_ON(pte_none(pkmap_page_table[i]));
79 78  
80 79 /*
81 80 * Don't need an atomic fetch-and-clear op here;
... ... @@ -158,8 +157,7 @@
158 157 if (!vaddr)
159 158 vaddr = map_new_virtual(page);
160 159 pkmap_count[PKMAP_NR(vaddr)]++;
161   - if (pkmap_count[PKMAP_NR(vaddr)] < 2)
162   - BUG();
  160 + BUG_ON(pkmap_count[PKMAP_NR(vaddr)] < 2);
163 161 spin_unlock(&kmap_lock);
164 162 return (void*) vaddr;
165 163 }
... ... @@ -174,8 +172,7 @@
174 172  
175 173 spin_lock(&kmap_lock);
176 174 vaddr = (unsigned long)page_address(page);
177   - if (!vaddr)
178   - BUG();
  175 + BUG_ON(!vaddr);
179 176 nr = PKMAP_NR(vaddr);
180 177  
181 178 /*
... ... @@ -220,8 +217,7 @@
220 217 return 0;
221 218  
222 219 page_pool = mempool_create_page_pool(POOL_SIZE, 0);
223   - if (!page_pool)
224   - BUG();
  220 + BUG_ON(!page_pool);
225 221 printk("highmem bounce pool size: %d pages\n", POOL_SIZE);
226 222  
227 223 return 0;
... ... @@ -264,8 +260,7 @@
264 260  
265 261 isa_page_pool = mempool_create(ISA_POOL_SIZE, mempool_alloc_pages_isa,
266 262 mempool_free_pages, (void *) 0);
267   - if (!isa_page_pool)
268   - BUG();
  263 + BUG_ON(!isa_page_pool);
269 264  
270 265 printk("isa bounce pool size: %d pages\n", ISA_POOL_SIZE);
271 266 return 0;