---

yaml --- r: 117714 b: refs/heads/master c: f81db82 h: refs/heads/master v: v3
git-mirror · Oct 23, 2008 · 9eabf87 · 9eabf87
1 parent 156a14f
commit 9eabf87
Show file tree

Hide file tree

Showing 106 changed files with 5,749 additions and 3,296 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8aea20018aefa51bf818914c9c1ef9006353dbb
+refs/heads/master: f81db8200d1aaf45069399e7525c442ac3013826
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -378,9 +378,8 @@ T:	git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 S:	Supported
 
 AMD MICROCODE UPDATE SUPPORT
-P:      Andreas Herrmann
-M:      andeas.herrmann3@amd.com
-L:      amd64-microcode@amd64.org
+P:      Peter Oruba
+M:      peter.oruba@amd.com
 S:      Supported
 
 AMS (Apple Motion Sensor) DRIVER

diff --git a/trunk/arch/m68k/amiga/config.c b/trunk/arch/m68k/amiga/config.c
@@ -15,7 +15,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/seq_file.h>
 #include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/rtc.h>
@@ -94,7 +93,7 @@ static char amiga_model_name[13] = "Amiga ";
 
 static void amiga_sched_init(irq_handler_t handler);
 static void amiga_get_model(char *model);
-static void amiga_get_hardware_list(struct seq_file *m);
+static int amiga_get_hardware_list(char *buffer);
 /* amiga specific timer functions */
 static unsigned long amiga_gettimeoffset(void);
 static int a3000_hwclk(int, struct rtc_time *);
@@ -912,11 +911,13 @@ static void amiga_get_model(char *model)
 }
 
 
-static void amiga_get_hardware_list(struct seq_file *m)
+static int amiga_get_hardware_list(char *buffer)
 {
+	int len = 0;
+
 	if (AMIGAHW_PRESENT(CHIP_RAM))
-		seq_printf(m, "Chip RAM:\t%ldK\n", amiga_chip_size>>10);
-	seq_printf(m, "PS Freq:\t%dHz\nEClock Freq:\t%ldHz\n",
+		len += sprintf(buffer+len, "Chip RAM:\t%ldK\n", amiga_chip_size>>10);
+	len += sprintf(buffer+len, "PS Freq:\t%dHz\nEClock Freq:\t%ldHz\n",
 			amiga_psfreq, amiga_eclock);
 	if (AMIGAHW_PRESENT(AMI_VIDEO)) {
 		char *type;
@@ -934,14 +935,14 @@ static void amiga_get_hardware_list(struct seq_file *m)
 			type = "Old or Unknown";
 			break;
 		}
-		seq_printf(m, "Graphics:\t%s\n", type);
+		len += sprintf(buffer+len, "Graphics:\t%s\n", type);
 	}
 
 #define AMIGAHW_ANNOUNCE(name, str)			\
 	if (AMIGAHW_PRESENT(name))			\
-		seq_printf (m, "\t%s\n", str)
+		len += sprintf (buffer+len, "\t%s\n", str)
 
-	seq_printf (m, "Detected hardware:\n");
+	len += sprintf (buffer + len, "Detected hardware:\n");
 
 	AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video");
 	AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter");
@@ -974,13 +975,15 @@ static void amiga_get_hardware_list(struct seq_file *m)
 	AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA Slot");
 #ifdef CONFIG_ZORRO
 	if (AMIGAHW_PRESENT(ZORRO))
-		seq_printf(m, "\tZorro II%s AutoConfig: %d Expansion "
+		len += sprintf(buffer+len, "\tZorro II%s AutoConfig: %d Expansion "
 				"Device%s\n",
 				AMIGAHW_PRESENT(ZORRO3) ? "I" : "",
 				zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
 #endif /* CONFIG_ZORRO */
 
 #undef AMIGAHW_ANNOUNCE
+
+	return len;
 }
 
 /*

diff --git a/trunk/arch/m68k/atari/config.c b/trunk/arch/m68k/atari/config.c
@@ -26,7 +26,6 @@
 
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/seq_file.h>
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -64,7 +63,7 @@ int atari_rtc_year_offset;
 /* local function prototypes */
 static void atari_reset(void);
 static void atari_get_model(char *model);
-static void atari_get_hardware_list(struct seq_file *m);
+static int atari_get_hardware_list(char *buffer);
 
 /* atari specific irq functions */
 extern void atari_init_IRQ (void);
@@ -612,21 +611,21 @@ static void atari_get_model(char *model)
 }
 
 
-static void atari_get_hardware_list(struct seq_file *m)
+static int atari_get_hardware_list(char *buffer)
 {
-	int i;
+	int len = 0, i;
 
 	for (i = 0; i < m68k_num_memory; i++)
-		seq_printf(m, "\t%3ld MB at 0x%08lx (%s)\n",
+		len += sprintf(buffer+len, "\t%3ld MB at 0x%08lx (%s)\n",
 				m68k_memory[i].size >> 20, m68k_memory[i].addr,
 				(m68k_memory[i].addr & 0xff000000 ?
 				 "alternate RAM" : "ST-RAM"));
 
 #define ATARIHW_ANNOUNCE(name, str)			\
 	if (ATARIHW_PRESENT(name))			\
-		seq_printf(m, "\t%s\n", str)
+		len += sprintf(buffer + len, "\t%s\n", str)
 
-	seq_printf(m, "Detected hardware:\n");
+	len += sprintf(buffer + len, "Detected hardware:\n");
 	ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter");
 	ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter");
 	ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter");
@@ -655,4 +654,6 @@ static void atari_get_hardware_list(struct seq_file *m)
 	ATARIHW_ANNOUNCE(BLITTER, "Blitter");
 	ATARIHW_ANNOUNCE(VME, "VME Bus");
 	ATARIHW_ANNOUNCE(DSP56K, "DSP56001 processor");
+
+	return len;
 }
diff --git a/trunk/arch/m68k/atari/stram.c b/trunk/arch/m68k/atari/stram.c
@@ -42,7 +42,6 @@
 /* abbrev for the && above... */
 #define DO_PROC
 #include <linux/proc_fs.h>
-#include <linux/seq_file.h>
 #endif
 
 /*
@@ -324,16 +323,19 @@ static int remove_region( BLOCK *block )
 
 #ifdef DO_PROC
 
-#define	PRINT_PROC(fmt,args...) seq_printf( m, fmt, ##args )
+#define	PRINT_PROC(fmt,args...) len += sprintf( buf+len, fmt, ##args )
 
-static int stram_proc_show(struct seq_file *m, void *v)
+int get_stram_list( char *buf )
 {
+	int len = 0;
 	BLOCK *p;
 
 	PRINT_PROC("Total ST-RAM:      %8u kB\n",
 			   (stram_end - stram_start) >> 10);
 	PRINT_PROC( "Allocated regions:\n" );
 	for( p = alloc_list; p; p = p->next ) {
+		if (len + 50 >= PAGE_SIZE)
+			break;
 		PRINT_PROC("0x%08lx-0x%08lx: %s (",
 			   virt_to_phys(p->start),
 			   virt_to_phys(p->start+p->size-1),
@@ -344,27 +346,9 @@ static int stram_proc_show(struct seq_file *m, void *v)
 			PRINT_PROC( "??)\n" );
 	}
 
-	return 0;
-}
-
-static int stram_proc_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, stram_proc_show, NULL);
+	return( len );
 }
 
-static const struct file_operations stram_proc_fops = {
-	.open		= stram_proc_open,
-	.read		= seq_read,
-	.llseek		= seq_lseek,
-	.release	= single_release,
-};
-
-static int __init proc_stram_init(void)
-{
-	proc_create("stram", 0, NULL, &stram_proc_fops);
-	return 0;
-}
-module_init(proc_stram_init);
 #endif
 
 

diff --git a/trunk/arch/m68k/bvme6000/config.c b/trunk/arch/m68k/bvme6000/config.c
@@ -38,6 +38,7 @@
 #include <asm/bvme6000hw.h>
 
 static void bvme6000_get_model(char *model);
+static int  bvme6000_get_hardware_list(char *buffer);
 extern void bvme6000_sched_init(irq_handler_t handler);
 extern unsigned long bvme6000_gettimeoffset (void);
 extern int bvme6000_hwclk (int, struct rtc_time *);
@@ -81,6 +82,15 @@ static void bvme6000_get_model(char *model)
     sprintf(model, "BVME%d000", m68k_cputype == CPU_68060 ? 6 : 4);
 }
 
+
+/* No hardware options on BVME6000? */
+
+static int bvme6000_get_hardware_list(char *buffer)
+{
+    *buffer = '\0';
+    return 0;
+}
+
 /*
  * This function is called during kernel startup to initialize
  * the bvme6000 IRQ handling routines.
@@ -117,6 +127,7 @@ void __init config_bvme6000(void)
     mach_set_clock_mmss	 = bvme6000_set_clock_mmss;
     mach_reset		 = bvme6000_reset;
     mach_get_model       = bvme6000_get_model;
+    mach_get_hardware_list = bvme6000_get_hardware_list;
 
     printk ("Board is %sconfigured as a System Controller\n",
 		*config_reg_ptr & BVME_CONFIG_SW1 ? "" : "not ");

diff --git a/trunk/arch/m68k/kernel/setup.c b/trunk/arch/m68k/kernel/setup.c
@@ -20,7 +20,6 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/module.h>
 #include <linux/initrd.h>
@@ -81,7 +80,7 @@ void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL;
 /* machine dependent irq functions */
 void (*mach_init_IRQ) (void) __initdata = NULL;
 void (*mach_get_model) (char *model);
-void (*mach_get_hardware_list) (struct seq_file *m);
+int (*mach_get_hardware_list) (char *buffer);
 /* machine dependent timer functions */
 unsigned long (*mach_gettimeoffset) (void);
 int (*mach_hwclk) (int, struct rtc_time*);
@@ -468,9 +467,9 @@ const struct seq_operations cpuinfo_op = {
 	.show	= show_cpuinfo,
 };
 
-#ifdef CONFIG_PROC_HARDWARE
-static int hardware_proc_show(struct seq_file *m, void *v)
+int get_hardware_list(char *buffer)
 {
+	int len = 0;
 	char model[80];
 	unsigned long mem;
 	int i;
@@ -480,37 +479,17 @@ static int hardware_proc_show(struct seq_file *m, void *v)
 	else
 		strcpy(model, "Unknown m68k");
 
-	seq_printf(m, "Model:\t\t%s\n", model);
+	len += sprintf(buffer + len, "Model:\t\t%s\n", model);
 	for (mem = 0, i = 0; i < m68k_num_memory; i++)
 		mem += m68k_memory[i].size;
-	seq_printf(m, "System Memory:\t%ldK\n", mem >> 10);
+	len += sprintf(buffer + len, "System Memory:\t%ldK\n", mem >> 10);
 
 	if (mach_get_hardware_list)
-		mach_get_hardware_list(m);
+		len += mach_get_hardware_list(buffer + len);
 
-	return 0;
-}
-
-static int hardware_proc_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, hardware_proc_show, NULL);
+	return len;
 }
 
-static const struct file_operations hardware_proc_fops = {
-	.open		= hardware_proc_open,
-	.read		= seq_read,
-	.llseek		= seq_lseek,
-	.release	= single_release,
-};
-
-static int __init proc_hardware_init(void)
-{
-	proc_create("hardware", 0, NULL, &hardware_proc_fops);
-	return 0;
-}
-module_init(proc_hardware_init);
-#endif
-
 void check_bugs(void)
 {
 #ifndef CONFIG_M68KFPU_EMU

diff --git a/trunk/arch/m68k/mvme147/config.c b/trunk/arch/m68k/mvme147/config.c
@@ -37,6 +37,7 @@
 
 
 static void mvme147_get_model(char *model);
+static int  mvme147_get_hardware_list(char *buffer);
 extern void mvme147_sched_init(irq_handler_t handler);
 extern unsigned long mvme147_gettimeoffset (void);
 extern int mvme147_hwclk (int, struct rtc_time *);
@@ -75,6 +76,14 @@ static void mvme147_get_model(char *model)
 	sprintf(model, "Motorola MVME147");
 }
 
+
+static int mvme147_get_hardware_list(char *buffer)
+{
+	*buffer = '\0';
+
+	return 0;
+}
+
 /*
  * This function is called during kernel startup to initialize
  * the mvme147 IRQ handling routines.
@@ -95,6 +104,7 @@ void __init config_mvme147(void)
 	mach_set_clock_mmss	= mvme147_set_clock_mmss;
 	mach_reset		= mvme147_reset;
 	mach_get_model		= mvme147_get_model;
+	mach_get_hardware_list	= mvme147_get_hardware_list;
 
 	/* Board type is only set by newer versions of vmelilo/tftplilo */
 	if (!vme_brdtype)

diff --git a/trunk/arch/m68k/mvme16x/config.c b/trunk/arch/m68k/mvme16x/config.c
@@ -17,7 +17,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/seq_file.h>
 #include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/linkage.h>
@@ -43,6 +42,7 @@ extern t_bdid mvme_bdid;
 static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;
 
 static void mvme16x_get_model(char *model);
+static int  mvme16x_get_hardware_list(char *buffer);
 extern void mvme16x_sched_init(irq_handler_t handler);
 extern unsigned long mvme16x_gettimeoffset (void);
 extern int mvme16x_hwclk (int, struct rtc_time *);
@@ -93,21 +93,26 @@ static void mvme16x_get_model(char *model)
 }
 
 
-static void mvme16x_get_hardware_list(struct seq_file *m)
+static int mvme16x_get_hardware_list(char *buffer)
 {
     p_bdid p = &mvme_bdid;
+    int len = 0;
 
     if (p->brdno == 0x0162 || p->brdno == 0x0172)
     {
 	unsigned char rev = *(unsigned char *)MVME162_VERSION_REG;
 
-	seq_printf (m, "VMEchip2        %spresent\n",
+	len += sprintf (buffer+len, "VMEchip2        %spresent\n",
 			rev & MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : "");
-	seq_printf (m, "SCSI interface  %spresent\n",
+	len += sprintf (buffer+len, "SCSI interface  %spresent\n",
 			rev & MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : "");
-	seq_printf (m, "Ethernet i/f    %spresent\n",
+	len += sprintf (buffer+len, "Ethernet i/f    %spresent\n",
 			rev & MVME16x_CONFIG_NO_ETHERNET ? "NOT " : "");
     }
+    else
+	*buffer = '\0';
+
+    return (len);
 }
 
 /*