Commit efd247fa authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'sched/debug' and 'linus' into sched/core

parents af66df5e 59fcbdda

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -3738,7 +3738,7 @@ S: 93149 Nittenau 
S: Germany



N: Gertjan van Wingerde

E: gwingerde@home.nl

E: gwingerde@gmail.com

D: Ralink rt2x00 WLAN driver

D: Minix V2 file-system

D: Misc fixes

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -566,6 +566,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) 
# disable pointer signed / unsigned warnings in gcc 4.0

KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)



# disable invalid "can't wrap" optimzations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fwrapv)



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

# But warn user when we do so

warn-assign = \

arch/m68k/include/asm/param.h

+23 −2
Original line number Diff line number Diff line 
#ifndef _M68K_PARAM_H

#define _M68K_PARAM_H



#ifdef __KERNEL__

# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */

# define USER_HZ	100		/* .. some user interfaces are in "ticks" */

# define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */

#endif



#ifndef HZ

#define HZ 100

#endif



#ifdef __uClinux__

#include "param_no.h"

#define EXEC_PAGESIZE	4096

#else

#include "param_mm.h"

#define EXEC_PAGESIZE	8192

#endif



#ifndef NOGROUP

#define NOGROUP		(-1)

#endif



#define MAXHOSTNAMELEN	64	/* max length of hostname */



#endif /* _M68K_PARAM_H */

arch/m68k/include/asm/param_mm.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#ifndef _M68K_PARAM_H

#define _M68K_PARAM_H



#ifdef __KERNEL__

# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */

# define USER_HZ	100		/* .. some user interfaces are in "ticks" */

# define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */

#endif



#ifndef HZ

#define HZ 100

#endif



#define EXEC_PAGESIZE	8192



#ifndef NOGROUP

#define NOGROUP		(-1)

#endif



#define MAXHOSTNAMELEN	64	/* max length of hostname */



#endif /* _M68K_PARAM_H */

arch/m68k/include/asm/param_no.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_PARAM_H

#define _M68KNOMMU_PARAM_H



#ifdef __KERNEL__

#define HZ CONFIG_HZ

#define	USER_HZ		HZ

#define	CLOCKS_PER_SEC	(USER_HZ)

#endif



#ifndef HZ

#define HZ	100

#endif



#define EXEC_PAGESIZE	4096



#ifndef NOGROUP

#define NOGROUP		(-1)

#endif



#define MAXHOSTNAMELEN	64	/* max length of hostname */



#endif /* _M68KNOMMU_PARAM_H */