cpu_dev->c_identify is only called from arch/i386/common.c:identify_cpu(), and this after generic_identify() already has been called. There is no need to call this function twice and hook it in c_identify - but I may be wrong, please double check before applying. This patch also removes generic_identify() from cpu.h to avoid unnecessary future nesting. Signed-off-by: Magnus Damm <magnus@valinux.co.jp> Signed-off-by: Andi Kleen <ak@suse.de>
		
			
				
	
	
		
			28 lines
		
	
	
	
		
			654 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			28 lines
		
	
	
	
		
			654 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
 | 
						|
struct cpu_model_info {
 | 
						|
	int vendor;
 | 
						|
	int family;
 | 
						|
	char *model_names[16];
 | 
						|
};
 | 
						|
 | 
						|
/* attempt to consolidate cpu attributes */
 | 
						|
struct cpu_dev {
 | 
						|
	char	* c_vendor;
 | 
						|
 | 
						|
	/* some have two possibilities for cpuid string */
 | 
						|
	char	* c_ident[2];	
 | 
						|
 | 
						|
	struct		cpu_model_info c_models[4];
 | 
						|
 | 
						|
	void		(*c_init)(struct cpuinfo_x86 * c);
 | 
						|
	void		(*c_identify)(struct cpuinfo_x86 * c);
 | 
						|
	unsigned int	(*c_size_cache)(struct cpuinfo_x86 * c, unsigned int size);
 | 
						|
};
 | 
						|
 | 
						|
extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM];
 | 
						|
 | 
						|
extern int get_model_name(struct cpuinfo_x86 *c);
 | 
						|
extern void display_cacheinfo(struct cpuinfo_x86 *c);
 | 
						|
 | 
						|
extern void early_intel_workaround(struct cpuinfo_x86 *c);
 | 
						|
 |