Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse source
This commit is contained in:
Linus Torvalds 2005-07-09 09:29:09 -07:00
commit bb6b823810
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc64/Kconfig
View file

@ -43,6 +43,8 @@ config SPARC64_PAGE_SIZE_4MB
endchoice
source kernel/Kconfig.hz
source "init/Kconfig"
config SYSVIPC_COMPAT

2
arch/sparc64/kernel/dtlb_backend.S
View file

@ -16,7 +16,7 @@
#elif PAGE_SHIFT == 19
#define SZ_BITS _PAGE_SZ512K
#elif PAGE_SHIFT == 22
#define SZ_BITS _PAGE_SZ4M
#define SZ_BITS _PAGE_SZ4MB
#endif
#define VALID_SZ_BITS (_PAGE_VALID | SZ_BITS)

5
include/asm-sparc64/param.h
View file

@ -1,9 +1,10 @@
/* $Id: param.h,v 1.2 2000/10/30 21:01:41 davem Exp $ */
#ifndef _ASMSPARC64_PARAM_H
#define _ASMSPARC64_PARAM_H
#include <linux/config.h>
#ifdef __KERNEL__
# define HZ 1000 /* Internal kernel timer frequency */
# 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