Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 881c4776 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/cleanups' into x86/core

parents ab639f35 89139374

arch/x86/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -105,5 +105,6 @@ extern void __iomem *early_memremap(unsigned long offset, unsigned long size); 
extern void early_iounmap(void __iomem *addr, unsigned long size);

extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);



#define IO_SPACE_LIMIT 0xffff



#endif /* _ASM_X86_IO_H */

arch/x86/include/asm/io_32.h

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
  *  - Arnaldo Carvalho de Melo <acme@conectiva.com.br>

  */



#define IO_SPACE_LIMIT 0xffff



#define XQUAD_PORTIO_BASE 0xfe400000

#define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */

arch/x86/include/asm/io_64.h

+0 −2
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ __OUTS(b) 
__OUTS(w)

__OUTS(l)



#define IO_SPACE_LIMIT 0xffff



#if defined(__KERNEL__) && defined(__x86_64__)



#include <linux/vmalloc.h>