Commit 5fd01b72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fix from Vineet Gupta:
 "Small fixlet for ARC"

* tag 'arc-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: fix potential build snafu
parents f0429816 c3ca31ce

arch/arc/include/asm/pgtable.h

+0 −5
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ extern char empty_zero_page[PAGE_SIZE]; 


extern pgd_t swapper_pg_dir[] __aligned(PAGE_SIZE);



/* Macro to mark a page protection as uncacheable */

#define pgprot_noncached(prot)	(__pgprot(pgprot_val(prot) & ~_PAGE_CACHEABLE))



extern pgd_t swapper_pg_dir[] __aligned(PAGE_SIZE);



/* to cope with aliasing VIPT cache */

#define HAVE_ARCH_UNMAPPED_AREA