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

Commit bb6b8238 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 79af02c2 a6524813

arch/sparc64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ config SPARC64_PAGE_SIZE_4MB 


endchoice



source kernel/Kconfig.hz



source "init/Kconfig"



config SYSVIPC_COMPAT

arch/sparc64/kernel/dtlb_backend.S

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/asm-sparc64/param.h

+3 −2
Original line number Diff line number Diff line 
/* $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