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

Commit 6a0eec82 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

x86, um: get rid of system.h -> system.h include 



Long-term we want to split system.h and include barriers part from
underlying target; for now copy that part to sysdep.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 32926b3b

arch/um/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ core-y += $(ARCH_DIR)/kernel/ \ 
			   $(ARCH_DIR)/os-$(OS)/



# Have to precede the include because the included Makefiles reference them.

SYMLINK_HEADERS := archparam.h system.h processor.h ptrace.h \

SYMLINK_HEADERS := archparam.h processor.h ptrace.h \

	module.h vm-flags.h elf.h

SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))

arch/um/include/asm/system-i386.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __UM_SYSTEM_I386_H

#define __UM_SYSTEM_I386_H



#include "asm/system-generic.h"

    

#endif

arch/um/include/asm/system-ppc.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#ifndef __UM_SYSTEM_PPC_H

#define __UM_SYSTEM_PPC_H



#define _switch_to _ppc_switch_to



#include "asm/arch/system.h"



#undef _switch_to

 

#include "asm/system-generic.h"



#endif

arch/um/include/asm/system-x86_64.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/*

 * Copyright 2003 PathScale, Inc.

 *

 * Licensed under the GPL

 */



#ifndef __UM_SYSTEM_X86_64_H

#define __UM_SYSTEM_X86_64_H



#include "asm/system-generic.h"



#endif



/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */

arch/um/include/asm/system-generic.h→arch/um/include/asm/system.h

+1 −13
Original line number Diff line number Diff line 
#ifndef __UM_SYSTEM_GENERIC_H

#define __UM_SYSTEM_GENERIC_H



#include "asm/arch/system.h"



#undef switch_to

#undef local_irq_save

#undef local_irq_restore

#undef local_irq_disable

#undef local_irq_enable

#undef local_save_flags

#undef local_irq_restore

#undef local_irq_enable

#undef local_irq_disable

#undef local_irq_save

#undef irqs_disabled

#include "sysdep/system.h"



extern void *switch_to(void *prev, void *next, void *last);