Commit 327c21bc authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

x86: unify include/asm/dmi_32/64.h 



Unification, so we have these things in one file.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f1ea0546

include/asm-x86/dmi.h

+33 −3
Original line number Diff line number Diff line 
#ifndef _ASM_X86_DMI_H

#define _ASM_X86_DMI_H



#include <asm/io.h>



#ifdef CONFIG_X86_32

# include "dmi_32.h"

#else

# include "dmi_64.h"



/* Use early IO mappings for DMI because it's initialized early */

#define dmi_ioremap bt_ioremap

#define dmi_iounmap bt_iounmap

#define dmi_alloc alloc_bootmem



#else /* CONFIG_X86_32 */



#define DMI_MAX_DATA 2048



extern int dmi_alloc_index;

extern char dmi_alloc_data[DMI_MAX_DATA];



/* This is so early that there is no good way to allocate dynamic memory.

   Allocate data in an BSS array. */

static inline void *dmi_alloc(unsigned len)

{

	int idx = dmi_alloc_index;

	if ((dmi_alloc_index += len) > DMI_MAX_DATA)

		return NULL;

	return dmi_alloc_data + idx;

}



#define dmi_ioremap early_ioremap

#define dmi_iounmap early_iounmap



#endif



#endif

include/asm-x86/dmi_32.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#ifndef _ASM_DMI_H

#define _ASM_DMI_H 1



#include <asm/io.h>



/* Use early IO mappings for DMI because it's initialized early */

#define dmi_ioremap bt_ioremap

#define dmi_iounmap bt_iounmap

#define dmi_alloc alloc_bootmem



#endif

include/asm-x86/dmi_64.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
#ifndef _ASM_DMI_H

#define _ASM_DMI_H 1



#include <asm/io.h>



#define DMI_MAX_DATA 2048



extern int dmi_alloc_index;

extern char dmi_alloc_data[DMI_MAX_DATA];



/* This is so early that there is no good way to allocate dynamic memory.

   Allocate data in an BSS array. */

static inline void *dmi_alloc(unsigned len)

{

	int idx = dmi_alloc_index;

	if ((dmi_alloc_index += len) > DMI_MAX_DATA)

		return NULL;

	return dmi_alloc_data + idx;

}



#define dmi_ioremap early_ioremap

#define dmi_iounmap early_iounmap



#endif