summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2007-05-27 19:30:36 +0200
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-05-27 13:36:27 -0400
commite9541d0ca2a5d713c5d8dcb635d3f41e75c90bfb (patch)
treecc81f446c9fc1edb3d06341a637ff5525cff7da9 /include
parent25971f68d392f1816e21520e9e59648403b0bdad (diff)
downloadlinux-e9541d0ca2a5d713c5d8dcb635d3f41e75c90bfb.tar.gz
linux-e9541d0ca2a5d713c5d8dcb635d3f41e75c90bfb.tar.bz2
linux-e9541d0ca2a5d713c5d8dcb635d3f41e75c90bfb.zip
[PARISC] fix section mismatches in arch/parisc/kernel
Hi Kyle, this patch fixes two section mismatches in arch/parisc/kernel: WARNING: arch/parisc/kernel/built-in.o(.data.read_mostly+0xd8): Section mismatch: reference to .init.text:processor_probe (between 'cpu_driver' and 'boot_cpu_data') WARNING: arch/parisc/kernel/built-in.o(.text.alloc_pa_dev+0x140): Section mismatch: reference to .init.text:parisc_hardware_description (after 'alloc_pa_dev') Additionally, mark some tables as constants. Please apply, Helge Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-parisc/hardware.h2
-rw-r--r--include/asm-parisc/processor.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h
index daf58dd4ea07..4e9626836bab 100644
--- a/include/asm-parisc/hardware.h
+++ b/include/asm-parisc/hardware.h
@@ -35,7 +35,7 @@ enum cpu_type {
mako2 = 12 /* pa8900 pa 2.0 */
};
-extern char *cpu_name_version[][2]; /* mapping from enum cpu_type to strings */
+extern const char * const cpu_name_version[][2]; /* mapping from enum cpu_type to strings */
struct parisc_driver;
diff --git a/include/asm-parisc/processor.h b/include/asm-parisc/processor.h
index 0052dc926d91..6b294fb07a23 100644
--- a/include/asm-parisc/processor.h
+++ b/include/asm-parisc/processor.h
@@ -69,8 +69,8 @@ struct system_cpuinfo_parisc {
char sys_model_name[81]; /* PDC-ROM returnes this model name */
} pdc;
- char *cpu_name; /* e.g. "PA7300LC (PCX-L2)" */
- char *family_name; /* e.g. "1.1e" */
+ const char *cpu_name; /* e.g. "PA7300LC (PCX-L2)" */
+ const char *family_name; /* e.g. "1.1e" */
};