diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-25 18:57:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-25 18:57:25 -0800 |
commit | 840f51ffe126123e748df0f36c411a90db1efd93 (patch) | |
tree | 81a25939a99b9255777ca447cebc95b6385e61c3 /arch/sparc/include/asm/param.h | |
parent | e2197787efe54c0dcbdc4f6acb6dabb65f27f347 (diff) | |
parent | 1091ce6215a1cab60c3a4601a569cb727ca8637a (diff) | |
download | op-kernel-dev-840f51ffe126123e748df0f36c411a90db1efd93.zip op-kernel-dev-840f51ffe126123e748df0f36c411a90db1efd93.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix IRQ ->set_affinity() methods.
sparc: cpumask_of_node() should handle -1 as a node
sparc64: Update defconfig.
sparc: Add missing SW perf fault events.
sparc64: Fully support both performance counters.
sparc64: Add perf callchain support.
sparc: convert to arch_gettimeoffset()
sparc: leds_resource.end assigned to itself in clock_board_probe()
sparc32: Fix page_to_phys().
sparc: Simplify param.h by simply including <asm-generic/param.h>
sparc32: Update defconfig.
SPARC: use helpers for rlimits
sparc: copy_from_user() should not return -EFAULT
Diffstat (limited to 'arch/sparc/include/asm/param.h')
-rw-r--r-- | arch/sparc/include/asm/param.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/arch/sparc/include/asm/param.h b/arch/sparc/include/asm/param.h index 9836d9a..0bc356b 100644 --- a/arch/sparc/include/asm/param.h +++ b/arch/sparc/include/asm/param.h @@ -1,22 +1,7 @@ #ifndef _ASMSPARC_PARAM_H #define _ASMSPARC_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) -#endif - -#ifndef HZ -#define HZ 100 -#endif - #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ +#include <asm-generic/param.h> -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64 /* max length of hostname */ - -#endif +#endif /* _ASMSPARC_PARAM_H */ |