diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/powerpc/boot/addnote.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/powerpc/boot/addnote.c')
| -rw-r--r-- | arch/powerpc/boot/addnote.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/addnote.c b/arch/powerpc/boot/addnote.c index b1e5611b2ab1..349b5530d2c4 100644 --- a/arch/powerpc/boot/addnote.c +++ b/arch/powerpc/boot/addnote.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <string.h> | 20 | #include <string.h> |
| 21 | 21 | ||
| 22 | /* CHRP note section */ | 22 | /* CHRP note section */ |
| 23 | char arch[] = "PowerPC"; | 23 | static const char arch[] = "PowerPC"; |
| 24 | 24 | ||
| 25 | #define N_DESCR 6 | 25 | #define N_DESCR 6 |
| 26 | unsigned int descr[N_DESCR] = { | 26 | unsigned int descr[N_DESCR] = { |
| @@ -33,7 +33,7 @@ unsigned int descr[N_DESCR] = { | |||
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | /* RPA note section */ | 35 | /* RPA note section */ |
| 36 | char rpaname[] = "IBM,RPA-Client-Config"; | 36 | static const char rpaname[] = "IBM,RPA-Client-Config"; |
| 37 | 37 | ||
| 38 | /* | 38 | /* |
| 39 | * Note: setting ignore_my_client_config *should* mean that OF ignores | 39 | * Note: setting ignore_my_client_config *should* mean that OF ignores |