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

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

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* ssh://master.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (35 commits)
  x86: Add HPET force support for MCP55 (nForce 5) chipsets
  x86: Force enable HPET for CK804 (nForce 4) chipsets
  x86: clean up setup.h and the boot code
  x86: Save registers in saved_context during suspend and hibernation
  x86: merge setup_32/64.h
  x86: merge signal_32/64.h
  x86: merge required-features.h
  x86: merge sigcontext_32/64.h
  x86: merge msr_32/64.h
  x86: merge mttr_32/64.h
  x86: merge statfs_32/64.h
  x86: merge stat_32/64.h
  x86: merge shmbuf_32/64.h
  x86: merge ptrace_32/64.h
  x86: merge msgbuf_32/64.h
  x86: merge elf_32/64.h
  x86: merge byteorder_32/64.h
  x86: whitespace cleanup of mce_64.c
  x86: consolidate the cpu/ related code usage
  x86: prepare consolidation of cpu/ related code usage
  ...
parents 1212663f 1b82ba6e

Documentation/kernel-parameters.txt

+2 −1
Original line number Diff line number Diff line
@@ -422,7 +422,8 @@ and is between 256 and 4096 characters. It is defined in the file 
	hpet=		[X86-32,HPET] option to control HPET usage

			Format: { enable (default) | disable | force }

			disable: disable HPET and use PIT instead

			force: allow force enabled of undocumented chips (ICH4, VIA)

			force: allow force enabled of undocumented chips (ICH4,

			VIA, nVidia)



	com20020=	[HW,NET] ARCnet - COM20020 chipset

			Format:

arch/i386/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1270,6 +1270,8 @@ source "drivers/Kconfig" 


source "fs/Kconfig"



source "kernel/Kconfig.instrumentation"



source "arch/i386/Kconfig.debug"



source "security/Kconfig"

arch/i386/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ 
# Fill in SRCARCH

SRCARCH	:= x86



# BITS is used as extension for files which are available in a 32 bit

# and a 64 bit version to simplify shared Makefiles.

# e.g.: obj-y += foo_$(BITS).o

BITS := 32

export BITS



HAS_BIARCH      := $(call cc-option-yn, -m32)

ifeq ($(HAS_BIARCH),y)

AS              := $(AS) --32

arch/x86/boot/boot.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/types.h>

#include <linux/edd.h>

#include <asm/boot.h>

#include <asm/bootparam.h>

#include <asm/setup.h>



/* Useful macros */

#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))

arch/x86/boot/compressed/relocs.c

+2 −4
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ static const char* safe_abs_relocs[] = { 


static int is_safe_abs_reloc(const char* sym_name)

{

	int i, array_size;



	array_size = sizeof(safe_abs_relocs)/sizeof(char*);

	int i;



	for(i = 0; i < array_size; i++) {

	for(i = 0; i < ARRAY_SIZE(safe_abs_relocs); i++) {

		if (!strcmp(sym_name, safe_abs_relocs[i]))

			/* Match found */

			return 1;