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

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

Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
  x86: canonicalize remaining header guards
  x86: drop double underscores from header guards
  x86: Fix ASM_X86__ header guards
  x86, um: get rid of uml-config.h
  x86, um: get rid of arch/um/Kconfig.arch
  x86, um: get rid of arch/um/os symlink
  x86, um: get rid of excessive includes of uml-config.h
  x86, um: get rid of header symlinks
  x86, um: merge Kconfig.i386 and Kconfig.x86_64
  x86, um: get rid of sysdep symlink
  x86, um: trim the junk from uml ptrace-*.h
  x86, um: take vm-flags.h to sysdep
  x86, um: get rid of uml asm/arch
  x86, um: get rid of uml highmem.h
  x86, um: get rid of uml unistd.h
  x86, um: get rid of system.h -> system.h include
  x86, um: uml atomic.h is not needed anymore
  x86, um: untangle uml ldt.h
  x86, um: get rid of more uml asm/arch uses
  x86, um: remove dead header (uml module-generic.h; never used these days)
  ...
parents 765426e8 5e1b0075

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ ifeq ($(config-targets),1) 
# KBUILD_DEFCONFIG may point out an alternative default configuration

# used for 'make defconfig'

include $(srctree)/arch/$(SRCARCH)/Makefile

export KBUILD_DEFCONFIG

export KBUILD_DEFCONFIG KBUILD_KCONFIG



config %config: scripts_basic outputmakefile FORCE

	$(Q)mkdir -p include/linux include/config

arch/ia64/ia32/audit.c

+1 −1
Original line number Diff line number Diff line 
#include <asm-x86/unistd_32.h>

#include "../../x86/include/asm/unistd_32.h"



unsigned ia32_dir_class[] = {

#include <asm-generic/audit_dir_write.h>

arch/powerpc/include/asm/signal.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ typedef struct sigaltstack { 


#ifdef __KERNEL__

struct pt_regs;

extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);

#define ptrace_signal_deliver(regs, cookie) do { } while (0)

#endif /* __KERNEL__ */

arch/powerpc/kernel/signal.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 


#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);



extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,

				  size_t frame_size);

extern void restore_sigmask(sigset_t *set);

arch/um/Kconfig.common

0 → 100644
+77 −0
Original line number Diff line number Diff line 
config DEFCONFIG_LIST

	string

	option defconfig_list

	default "arch/$ARCH/defconfig"



# UML uses the generic IRQ subsystem

config GENERIC_HARDIRQS

	bool

	default y



config UML

	bool

	default y



config MMU

	bool

	default y



config NO_IOMEM

	def_bool y



mainmenu "Linux/Usermode Kernel Configuration"



config ISA

	bool



config SBUS

	bool



config PCI

	bool



config PCMCIA

	bool



# Yet to do!

config TRACE_IRQFLAGS_SUPPORT

	bool

	default n



config LOCKDEP_SUPPORT

	bool

	default y



config STACKTRACE_SUPPORT

	bool

	default n



config GENERIC_CALIBRATE_DELAY

	bool

	default y



config GENERIC_BUG

	bool

	default y

	depends on BUG



config GENERIC_TIME

	bool

	default y



config GENERIC_CLOCKEVENTS

	bool

	default y



# Used in kernel/irq/manage.c and include/linux/irq.h

config IRQ_RELEASE_METHOD

	bool

	default y



config HZ

	int

	default 100



config SUBARCH

	string

	option env="SUBARCH"