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

Commit 14671386 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, mrst: make mrst_timer_options an enum 



We have an enum mrst_timer_options, use it so that the kernel knows if
we're missing something from a switch statement or equivalent.

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
LKML-Reference: <1274295685-6774-4-git-send-email-jacob.jun.pan@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
parent a75af580

arch/x86/include/asm/mrst.h

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#ifndef _ASM_X86_MRST_H

#define _ASM_X86_MRST_H

extern int pci_mrst_init(void);

extern int mrst_timer_options __cpuinitdata;

int __init sfi_parse_mrtc(struct sfi_table_header *table);



/*
@@ -38,6 +37,8 @@ enum mrst_timer_options { 
	MRST_TIMER_LAPIC_APBT,

};



extern enum mrst_timer_options mrst_timer_options;



#define SFI_MTMR_MAX_NUM 8

#define SFI_MRTC_MAX	8

arch/x86/kernel/mrst.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
 * lapic (always-on,ARAT) ------ 150

 */



int mrst_timer_options __cpuinitdata;

__cpuinitdata enum mrst_timer_options mrst_timer_options;



static u32 sfi_mtimer_usage[SFI_MTMR_MAX_NUM];

static struct sfi_timer_table_entry sfi_mtimer_array[SFI_MTMR_MAX_NUM];