diff options
author | Helge Deller <deller@parisc-linux.org> | 2006-01-10 20:35:03 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@duet.int.mcmartin.ca> | 2006-01-10 20:35:03 -0500 |
commit | 8039de10aae3cd4cf0ef0ccebd58aff0e8810df2 (patch) | |
tree | af82e045c8fb3a417f78b49ec43413995b5f3c0f /drivers/parisc/led.c | |
parent | 02706647a49011ae1e7b4eca33e835d1681b094e (diff) |
[PARISC] Add __read_mostly section for parisc
Flag a whole bunch of things as __read_mostly on parisc. Also flag a few
branches as unlikely() and cleanup a bit of code.
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/parisc/led.c')
-rw-r--r-- | drivers/parisc/led.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index 315be4770d3e..f357d3f60360 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * (c) Copyright 2000 Red Hat Software | 4 | * (c) Copyright 2000 Red Hat Software |
5 | * (c) Copyright 2000 Helge Deller <hdeller@redhat.com> | 5 | * (c) Copyright 2000 Helge Deller <hdeller@redhat.com> |
6 | * (c) Copyright 2001-2004 Helge Deller <deller@gmx.de> | 6 | * (c) Copyright 2001-2005 Helge Deller <deller@gmx.de> |
7 | * (c) Copyright 2001 Randolph Chung <tausq@debian.org> | 7 | * (c) Copyright 2001 Randolph Chung <tausq@debian.org> |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
@@ -56,13 +56,13 @@ | |||
56 | relatively large amount of CPU time, some of the calculations can be | 56 | relatively large amount of CPU time, some of the calculations can be |
57 | turned off with the following variables (controlled via procfs) */ | 57 | turned off with the following variables (controlled via procfs) */ |
58 | 58 | ||
59 | static int led_type = -1; | 59 | static int led_type __read_mostly = -1; |
60 | static unsigned char lastleds; /* LED state from most recent update */ | 60 | static unsigned char lastleds; /* LED state from most recent update */ |
61 | static unsigned int led_heartbeat = 1; | 61 | static unsigned int led_heartbeat __read_mostly = 1; |
62 | static unsigned int led_diskio = 1; | 62 | static unsigned int led_diskio __read_mostly = 1; |
63 | static unsigned int led_lanrxtx = 1; | 63 | static unsigned int led_lanrxtx __read_mostly = 1; |
64 | static char lcd_text[32]; | 64 | static char lcd_text[32] __read_mostly; |
65 | static char lcd_text_default[32]; | 65 | static char lcd_text_default[32] __read_mostly; |
66 | 66 | ||
67 | 67 | ||
68 | static struct workqueue_struct *led_wq; | 68 | static struct workqueue_struct *led_wq; |
@@ -108,7 +108,7 @@ struct pdc_chassis_lcd_info_ret_block { | |||
108 | /* lcd_info is pre-initialized to the values needed to program KittyHawk LCD's | 108 | /* lcd_info is pre-initialized to the values needed to program KittyHawk LCD's |
109 | * HP seems to have used Sharp/Hitachi HD44780 LCDs most of the time. */ | 109 | * HP seems to have used Sharp/Hitachi HD44780 LCDs most of the time. */ |
110 | static struct pdc_chassis_lcd_info_ret_block | 110 | static struct pdc_chassis_lcd_info_ret_block |
111 | lcd_info __attribute__((aligned(8))) = | 111 | lcd_info __attribute__((aligned(8))) __read_mostly = |
112 | { | 112 | { |
113 | .model = DISPLAY_MODEL_LCD, | 113 | .model = DISPLAY_MODEL_LCD, |
114 | .lcd_width = 16, | 114 | .lcd_width = 16, |
@@ -144,7 +144,7 @@ static int start_task(void) | |||
144 | device_initcall(start_task); | 144 | device_initcall(start_task); |
145 | 145 | ||
146 | /* ptr to LCD/LED-specific function */ | 146 | /* ptr to LCD/LED-specific function */ |
147 | static void (*led_func_ptr) (unsigned char); | 147 | static void (*led_func_ptr) (unsigned char) __read_mostly; |
148 | 148 | ||
149 | #ifdef CONFIG_PROC_FS | 149 | #ifdef CONFIG_PROC_FS |
150 | static int led_proc_read(char *page, char **start, off_t off, int count, | 150 | static int led_proc_read(char *page, char **start, off_t off, int count, |