Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88984
b: refs/heads/master
c: 8f08403
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Ingo Molnar committed Apr 17, 2008
1 parent a417ca6 commit 6d7b1eb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 60e9bfd1bd5be433e56b050e025d3d5c91c967a8
refs/heads/master: 8f08403e61a86c3179642239184aff3a5f636be1
35 changes: 13 additions & 22 deletions trunk/include/asm-x86/mpspec_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* information is.
*/

#define SMP_MAGIC_IDENT (('_'<<24)|('P'<<16)|('M'<<8)|'_')
#define SMP_MAGIC_IDENT (('_'<<24) | ('P'<<16) | ('M'<<8) | '_')

#ifdef CONFIG_X86_32
# define MAX_MPC_ENTRY 1024
Expand All @@ -23,8 +23,7 @@
# define MAX_APICS 255
#endif

struct intel_mp_floating
{
struct intel_mp_floating {
char mpf_signature[4]; /* "_MP_" */
unsigned int mpf_physptr; /* Configuration table address */
unsigned char mpf_length; /* Our length (paragraphs) */
Expand All @@ -39,14 +38,13 @@ struct intel_mp_floating

#define MPC_SIGNATURE "PCMP"

struct mp_config_table
{
struct mp_config_table {
char mpc_signature[4];
unsigned short mpc_length; /* Size of table */
char mpc_spec; /* 0x01 */
char mpc_checksum;
char mpc_oem[8];
char mpc_productid[12];
char mpc_spec; /* 0x01 */
char mpc_checksum;
char mpc_oem[8];
char mpc_productid[12];
unsigned int mpc_oemptr; /* 0 if not present */
unsigned short mpc_oemsize; /* 0 if not present */
unsigned short mpc_oemcount;
Expand All @@ -71,8 +69,7 @@ struct mp_config_table
#define CPU_MODEL_MASK 0x00F0
#define CPU_FAMILY_MASK 0x0F00

struct mpc_config_processor
{
struct mpc_config_processor {
unsigned char mpc_type;
unsigned char mpc_apicid; /* Local APIC number */
unsigned char mpc_apicver; /* Its versions */
Expand All @@ -82,8 +79,7 @@ struct mpc_config_processor
unsigned int mpc_reserved[2];
};

struct mpc_config_bus
{
struct mpc_config_bus {
unsigned char mpc_type;
unsigned char mpc_busid;
unsigned char mpc_bustype[6];
Expand Down Expand Up @@ -111,17 +107,15 @@ struct mpc_config_bus

#define MPC_APIC_USABLE 0x01

struct mpc_config_ioapic
{
struct mpc_config_ioapic {
unsigned char mpc_type;
unsigned char mpc_apicid;
unsigned char mpc_apicver;
unsigned char mpc_flags;
unsigned int mpc_apicaddr;
};

struct mpc_config_intsrc
{
struct mpc_config_intsrc {
unsigned char mpc_type;
unsigned char mpc_irqtype;
unsigned short mpc_irqflag;
Expand All @@ -144,8 +138,7 @@ enum mp_irq_source_types {

#define MP_APIC_ALL 0xFF

struct mpc_config_lintsrc
{
struct mpc_config_lintsrc {
unsigned char mpc_type;
unsigned char mpc_irqtype;
unsigned short mpc_irqflag;
Expand All @@ -157,8 +150,7 @@ struct mpc_config_lintsrc

#define MPC_OEM_SIGNATURE "_OEM"

struct mp_config_oemtable
{
struct mp_config_oemtable {
char oem_signature[4];
unsigned short oem_length; /* Size of table */
char oem_rev; /* 0x01 */
Expand All @@ -185,4 +177,3 @@ enum mp_bustype {
MP_BUS_MCA,
};
#endif

0 comments on commit 6d7b1eb

Please sign in to comment.