tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[SPARC64]: Fix build with SPARSEMEM_VMEMMAP disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller bf4a7972 000775c5

+5 -1
unified split
+5 -1
arch/sparc64/kernel/ktlb.S
··· 1 /* arch/sparc64/kernel/ktlb.S: Kernel mapping TLB miss handling. 2 * 3 - * Copyright (C) 1995, 1997, 2005 David S. Miller <davem@davemloft.net> 4 * Copyright (C) 1996 Eddie C. Dost (ecd@brainaid.de) 5 * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) 6 * Copyright (C) 1996,98,99 Jakub Jelinek (jj@sunsite.mff.cuni.cz) ··· 226 ba,pt %xcc, sun4v_dtlb_load 227 mov %g5, %g3 228 229 kvmap_vmemmap: 230 sub %g4, %g5, %g5 231 srlx %g5, 22, %g5 ··· 235 or %g1, %lo(vmemmap_table), %g1 236 ba,pt %xcc, kvmap_dtlb_load 237 ldx [%g1 + %g5], %g5 238 239 kvmap_dtlb_nonlinear: 240 /* Catch kernel NULL pointer derefs. */ ··· 244 bleu,pn %xcc, kvmap_dtlb_longpath 245 nop 246 247 /* Do not use the TSB for vmemmap. */ 248 mov (VMEMMAP_BASE >> 24), %g5 249 sllx %g5, 24, %g5 250 cmp %g4,%g5 251 bgeu,pn %xcc, kvmap_vmemmap 252 nop 253 254 KERN_TSB_LOOKUP_TL1(%g4, %g6, %g5, %g1, %g2, %g3, kvmap_dtlb_load) 255
··· 1 /* arch/sparc64/kernel/ktlb.S: Kernel mapping TLB miss handling. 2 * 3 + * Copyright (C) 1995, 1997, 2005, 2008 David S. Miller <davem@davemloft.net> 4 * Copyright (C) 1996 Eddie C. Dost (ecd@brainaid.de) 5 * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) 6 * Copyright (C) 1996,98,99 Jakub Jelinek (jj@sunsite.mff.cuni.cz) ··· 226 ba,pt %xcc, sun4v_dtlb_load 227 mov %g5, %g3 228 229 + #ifdef CONFIG_SPARSEMEM_VMEMMAP 230 kvmap_vmemmap: 231 sub %g4, %g5, %g5 232 srlx %g5, 22, %g5 ··· 234 or %g1, %lo(vmemmap_table), %g1 235 ba,pt %xcc, kvmap_dtlb_load 236 ldx [%g1 + %g5], %g5 237 + #endif 238 239 kvmap_dtlb_nonlinear: 240 /* Catch kernel NULL pointer derefs. */ ··· 242 bleu,pn %xcc, kvmap_dtlb_longpath 243 nop 244 245 + #ifdef CONFIG_SPARSEMEM_VMEMMAP 246 /* Do not use the TSB for vmemmap. */ 247 mov (VMEMMAP_BASE >> 24), %g5 248 sllx %g5, 24, %g5 249 cmp %g4,%g5 250 bgeu,pn %xcc, kvmap_vmemmap 251 nop 252 + #endif 253 254 KERN_TSB_LOOKUP_TL1(%g4, %g6, %g5, %g1, %g2, %g3, kvmap_dtlb_load) 255