PATCH powerpc: 00/04 Remove __pmac, etc, sections, merge sections.h
Subsystems (2)
Here is a new patch that removes all notion of the pmac, prep, chrp and openfirmware initialization sections, and then unifies the sections.h files without those __pmac, etc, sections identifiers cluttering things up.
---
Part 01/04 - Remove sections use from ppc
arch/ppc/kernel/pci.c | 10 +- arch/ppc/kernel/setup.c | 2 arch/ppc/platforms/chrp_pci.c | 8 +- arch/ppc/platforms/chrp_setup.c | 16 ++- arch/ppc/platforms/chrp_smp.c | 2 arch/ppc/platforms/chrp_time.c | 8 +- arch/ppc/platforms/pmac_backlight.c | 16 ++- arch/ppc/platforms/pmac_cpufreq.c | 36 ++++--- arch/ppc/platforms/pmac_feature.c | 176 ++++++++++++++++++----------------- arch/ppc/platforms/pmac_nvram.c | 42 ++++---- arch/ppc/platforms/pmac_pci.c | 22 ++-- arch/ppc/platforms/pmac_pic.c | 26 +++-- arch/ppc/platforms/pmac_setup.c | 12 +- arch/ppc/platforms/pmac_smp.c | 10 +- arch/ppc/platforms/pmac_time.c | 8 +- arch/ppc/platforms/prep_pci.c | 64 ++++++------- arch/ppc/platforms/prep_setup.c | 44 ++++----- arch/ppc/platforms/residual.c | 2 arch/ppc/syslib/btext.c | 6 + arch/ppc/syslib/prep_nvram.c | 13 +-- arch/ppc/syslib/prom.c | 18 ++--
Part 02/04 - Remove sections use from ppc64 and drivers
arch/ppc64/kernel/pmac_feature.c | 60 ++++++------ arch/ppc64/kernel/pmac_nvram.c | 30 +++--- arch/ppc64/kernel/pmac_pci.c | 12 +- arch/ppc64/kernel/pmac_setup.c | 10 +- arch/ppc64/kernel/pmac_smp.c | 2 arch/ppc64/kernel/pmac_time.c | 4 - drivers/ide/ppc/pmac.c | 80 ++++++++-------- drivers/macintosh/ans-lcd.c | 10 +- drivers/macintosh/mediabay.c | 56 ++++++----- drivers/macintosh/via-cuda.c | 1 drivers/macintosh/via-pmu.c | 129 +++++++++++++------------- drivers/macintosh/via-pmu68k.c | 15 +--
Part 03/04 - Remove section free() and linker script
arch/ppc/kernel/vmlinux.lds.S | 26 ----- arch/ppc/mm/init.c | 12 --
Part 04/04 - Merge simplified sections.h into asm-powerpc
include/asm-powerpc/sections.h | 20 ++++ include/asm-ppc/sections.h | 33 ------- include/asm-ppc64/sections.h | 29 ------
38 files changed, 492 insertions(+), 578 deletions(-)
PATCH powerpc: 01/04 Remove sections use from ppc
arch/ppc/kernel/pci.c +5 -5
@@ -644,7 +644,7 @@ pcibios_alloc_controller(void)/* * Functions below are used on OpenFirmware machines. */ -static void __openfirmware +static void make_one_node_map (struct device_node * node,u8 pci_bus) {int *bus_range;
@@ -678,7 +678,7 @@ make_one_node_map(struct device_node* no } } -void __openfirmware +void pcibios_make_OF_bus_map (void ) {int i;
@@ -720,7 +720,7 @@ pcibios_make_OF_bus_map(void)typedef int (*pci_OF_scan_iterator )(struct device_node * node,void * data); -static struct device_node* __openfirmware +static struct device_node *scan_OF_pci_childs (struct device_node * node,pci_OF_scan_iterator filter,void * data) {struct device_node * sub_node;
@@ -761,7 +761,7 @@ scan_OF_pci_childs_iterator(struct devicreturn 0 ; } -static struct device_node* __openfirmware +static struct device_node *scan_OF_childs_for_device (struct device_node * node,u8 bus,u8 dev_fn) {u8 filter_data[2 ] = {bus, dev_fn};
@@ -842,7 +842,7 @@ pci_find_hose_for_OF_device(struct devicreturn NULL ; } -static int __openfirmware +static int find_OF_pci_device_filter (struct device_node * node,void * data) {return ((void *)node == data);
arch/ppc/kernel/setup.c +1 -1
@@ -339,7 +339,7 @@ early_init(int r3, int r4, int r5)* Assume here that all clock rates are the same in a * smp system. -- Cort */ -int __openfirmware +int of_show_percpuinfo (struct seq_file *m,int i) {struct device_node *cpu_node;
arch/ppc/platforms/chrp_pci.c +4 -4
@@ -29,7 +29,7 @@ void __iomem *gg2_pci_config_base;* limit the bus number to 3 bits */ -int __chrp gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off, +int gg2_read_config (struct pci_bus *bus,unsigned int devfn,int off,int len,u32 *val) {volatile void __iomem *cfg_data;
@@ -56,7 +56,7 @@ int __chrp gg2_read_config(struct pci_bureturn PCIBIOS_SUCCESSFUL ; } -int __chrp gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off, +int gg2_write_config (struct pci_bus *bus,unsigned int devfn,int off,int len,u32 val) {volatile void __iomem *cfg_data;
@@ -92,7 +92,7 @@ static struct pci_ops gg2_pci_ops =/* * Access functions for PCI config space using RTAS calls. */ -int __chrp +int rtas_read_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 *val) {
@@ -108,7 +108,7 @@ rtas_read_config(struct pci_bus *bus, unreturn rval?PCIBIOS_DEVICE_NOT_FOUND :PCIBIOS_SUCCESSFUL ; } -int __chrp +int rtas_write_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 val) {
arch/ppc/platforms/chrp_setup.c +8 -8
@@ -105,7 +105,7 @@ static const char *gg2_cachemodes[4] = { "Disabled", "Write-Through", "Copy-Back", "Transparent Mode" }; -int __chrp +int chrp_show_cpuinfo (struct seq_file *m) {int i, sdramen;
@@ -303,7 +303,7 @@ void __init chrp_setup_arch(void)pci_create_OF_bus_map (); } -void __chrp +void chrp_event_scan (void ) {unsigned char log[1024 ];
@@ -314,7 +314,7 @@ chrp_event_scan(void) ppc_md.heartbeat_count = ppc_md.heartbeat_reset; } -void __chrp +void chrp_restart (char *cmd) { printk("RTAS system-reboot returned %d\n",
@@ -322,7 +322,7 @@ chrp_restart(char *cmd)for (;;); } -void __chrp +void chrp_power_off (void ) {/* allow power on only with power button press */
@@ -331,13 +331,13 @@ chrp_power_off(void)for (;;); } -void __chrp +void chrp_halt (void ) {chrp_power_off (); } -u_int __chrp +u_int chrp_irq_canonicalize (u_int irq) {if (irq ==2 )
@@ -572,7 +572,7 @@ chrp_init(unsigned long r3, unsigned lonif (ppc_md.progress) ppc_md.progress ("Linux/PPC " UTS_RELEASE "\n" ,0x0 ); } -void __chrp +void rtas_display_progress (char *s,unsigned short hex) {int width;
@@ -599,7 +599,7 @@ rtas_display_progress(char *s, unsignedcall_rtas ("display-character" ,1 ,1 ,NULL ,' ' ); } -void __chrp +void rtas_indicator_progress (char *s,unsigned short hex) {call_rtas ("set-indicator" ,3 ,1 ,NULL ,6 ,0 , hex);
arch/ppc/platforms/chrp_smp.c +1 -1
@@ -88,7 +88,7 @@ smp_chrp_take_timebase(void) }/* CHRP with openpic */ -struct smp_ops_t chrp_smp_ops __chrpdata = { +struct smp_ops_t chrp_smp_ops = { .message_pass = smp_openpic_message_pass, .probe = smp_chrp_probe, .kick_cpu = smp_chrp_kick_cpu,
arch/ppc/platforms/chrp_time.c +4 -4
@@ -52,7 +52,7 @@ long __init chrp_time_init(void)return 0 ; } -int __chrp chrp_cmos_clock_read(int addr) +int chrp_cmos_clock_read (int addr) {if (nvram_as1 !=0 )outb (addr>>8 , nvram_as1);
@@ -60,7 +60,7 @@ int __chrp chrp_cmos_clock_read(int addrreturn (inb (nvram_data)); } -void __chrp chrp_cmos_clock_write(unsigned long val, int addr) +void chrp_cmos_clock_write (unsigned long val,int addr) {if (nvram_as1 !=0 )outb (addr>>8 , nvram_as1);
@@ -72,7 +72,7 @@ void __chrp chrp_cmos_clock_write(unsign/* * Set the hardware clock. -- Cort */ -int __chrp chrp_set_rtc_time(unsigned long nowtime) +int chrp_set_rtc_time (unsigned long nowtime) {unsigned char save_control, save_freq_select;struct rtc_time tm;
@@ -118,7 +118,7 @@ int __chrp chrp_set_rtc_time(unsigned loreturn 0 ; } -unsigned long __chrp chrp_get_rtc_time (void ) +unsigned long chrp_get_rtc_time (void ) {unsigned int year, mon, day, hour, min, sec;int uip, i;
arch/ppc/platforms/pmac_backlight.c +8 -8
@@ -37,7 +37,7 @@ static int backlight_req_enable = -1;static void backlight_callback (void *); static DECLARE_WORK(backlight_work, backlight_callback, NULL); -void __pmac register_backlight_controller(struct backlight_controller *ctrler, +void register_backlight_controller (struct backlight_controller *ctrler,void *data,char *type) {struct device_node * bk_node;
@@ -99,7 +99,7 @@ void __pmac register_backlight_controlle }EXPORT_SYMBOL (register_backlight_controller); -void __pmac unregister_backlight_controller(struct backlight_controller +void unregister_backlight_controller (struct backlight_controller *ctrler,void *data) {/* We keep the current backlight level (for now) */
@@ -108,7 +108,7 @@ void __pmac unregister_backlight_control }EXPORT_SYMBOL (unregister_backlight_controller); -static int __pmac __set_backlight_enable(int enable) +static int __set_backlight_enable (int enable) {int rc;
@@ -122,7 +122,7 @@ static int __pmac __set_backlight_enablerelease_console_sem ();return rc; } -int __pmac set_backlight_enable(int enable) +int set_backlight_enable (int enable) {if (!backlighter)return -ENODEV ;
@@ -133,7 +133,7 @@ int __pmac set_backlight_enable(int enabEXPORT_SYMBOL (set_backlight_enable); -int __pmac get_backlight_enable(void) +int get_backlight_enable (void ) {if (!backlighter)return -ENODEV ;
@@ -141,7 +141,7 @@ int __pmac get_backlight_enable(void) }EXPORT_SYMBOL (get_backlight_enable); -static int __pmac __set_backlight_level(int level) +static int __set_backlight_level (int level) {int rc =0 ;
@@ -165,7 +165,7 @@ static int __pmac __set_backlight_level( }return rc; } -int __pmac set_backlight_level(int level) +int set_backlight_level (int level) {if (!backlighter)return -ENODEV ;
@@ -176,7 +176,7 @@ int __pmac set_backlight_level(int levelEXPORT_SYMBOL (set_backlight_level); -int __pmac get_backlight_level(void) +int get_backlight_level (void ) {if (!backlighter)return -ENODEV ;
arch/ppc/platforms/pmac_cpufreq.c +18 -18
@@ -136,7 +136,7 @@ static inline void debug_calc_bogomips(v/* Switch CPU speed under 750FX CPU control */ -static int __pmac cpu_750fx_cpu_speed(int low_speed) +static int cpu_750fx_cpu_speed (int low_speed) {u32 hid2;
@@ -172,7 +172,7 @@ static int __pmac cpu_750fx_cpu_speed(inreturn 0 ; } -static unsigned int __pmac cpu_750fx_get_cpu_speed(void) +static unsigned int cpu_750fx_get_cpu_speed (void ) {if (mfspr (SPRN_HID1 ) &HID1_PS )return low_freq;
@@ -181,7 +181,7 @@ static unsigned int __pmac cpu_750fx_get }/* Switch CPU speed using DFS */ -static int __pmac dfs_set_cpu_speed(int low_speed) +static int dfs_set_cpu_speed (int low_speed) {if (low_speed ==0 ) {/* ramping up, set voltage first */
@@ -205,7 +205,7 @@ static int __pmac dfs_set_cpu_speed(intreturn 0 ; } -static unsigned int __pmac dfs_get_cpu_speed(void) +static unsigned int dfs_get_cpu_speed (void ) {if (mfspr (SPRN_HID1 ) &HID1_DFS )return low_freq;
@@ -216,7 +216,7 @@ static unsigned int __pmac dfs_get_cpu_s/* Switch CPU speed using slewing GPIOs */ -static int __pmac gpios_set_cpu_speed(int low_speed) +static int gpios_set_cpu_speed (int low_speed) {int gpio, timeout =0 ;
@@ -258,7 +258,7 @@ static int __pmac gpios_set_cpu_speed(in/* Switch CPU speed under PMU control */ -static int __pmac pmu_set_cpu_speed(int low_speed) +static int pmu_set_cpu_speed (int low_speed) {struct adb_request req;unsigned long save_l2cr;
@@ -354,7 +354,7 @@ static int __pmac pmu_set_cpu_speed(intreturn 0 ; } -static int __pmac do_set_cpu_speed(int speed_mode, int notify) +static int do_set_cpu_speed (int speed_mode,int notify) {struct cpufreq_freqs freqs;unsigned long l3cr;
@@ -391,17 +391,17 @@ static int __pmac do_set_cpu_speed(int sreturn 0 ; } -static unsigned int __pmac pmac_cpufreq_get_speed(unsigned int cpu) +static unsigned int pmac_cpufreq_get_speed (unsigned int cpu) {return cur_freq; } -static int __pmac pmac_cpufreq_verify(struct cpufreq_policy *policy) +static int pmac_cpufreq_verify (struct cpufreq_policy *policy) {return cpufreq_frequency_table_verify (policy, pmac_cpu_freqs); } -static int __pmac pmac_cpufreq_target( struct cpufreq_policy *policy, +static int pmac_cpufreq_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation) {
@@ -414,13 +414,13 @@ static int __pmac pmac_cpufreq_target( sreturn do_set_cpu_speed (newstate,1 ); } -unsigned int __pmac pmac_get_one_cpufreq(int i) +unsigned int pmac_get_one_cpufreq (int i) {/* Supports only one CPU for now */ return (i ==0 ) ? cur_freq :0 ; } -static int __pmac pmac_cpufreq_cpu_init(struct cpufreq_policy *policy) +static int pmac_cpufreq_cpu_init (struct cpufreq_policy *policy) {if (policy->cpu !=0 )return -ENODEV ;
@@ -433,7 +433,7 @@ static int __pmac pmac_cpufreq_cpu_init(return cpufreq_frequency_table_cpuinfo (policy, pmac_cpu_freqs); } -static u32 __pmac read_gpio(struct device_node *np) +static u32 read_gpio (struct device_node *np) {u32 *reg = (u32 *)get_property (np,"reg" ,NULL );u32 offset;
@@ -452,7 +452,7 @@ static u32 __pmac read_gpio(struct devicreturn offset; } -static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg) +static int pmac_cpufreq_suspend (struct cpufreq_policy *policy,pm_message_t pmsg) {/* Ok, this could be made a bit smarter, but let's be robust for now. We * always force a speed change to high speed before sleep, to make sure
@@ -468,7 +468,7 @@ static int __pmac pmac_cpufreq_suspend(sreturn 0 ; } -static int __pmac pmac_cpufreq_resume(struct cpufreq_policy *policy) +static int pmac_cpufreq_resume (struct cpufreq_policy *policy) {/* If we resume, first check if we have a get() function */ if (get_speed_proc)
@@ -501,7 +501,7 @@ static struct cpufreq_driver pmac_cpufre }; -static int __pmac pmac_cpufreq_init_MacRISC3(struct device_node *cpunode) +static int pmac_cpufreq_init_MacRISC3 (struct device_node *cpunode) {struct device_node *volt_gpio_np =of_find_node_by_name (NULL ,"voltage-gpio" );
@@ -593,7 +593,7 @@ static int __pmac pmac_cpufreq_init_MacRreturn 0 ; } -static int __pmac pmac_cpufreq_init_7447A(struct device_node *cpunode) +static int pmac_cpufreq_init_7447A (struct device_node *cpunode) {struct device_node *volt_gpio_np;
@@ -620,7 +620,7 @@ static int __pmac pmac_cpufreq_init_7447return 0 ; } -static int __pmac pmac_cpufreq_init_750FX(struct device_node *cpunode) +static int pmac_cpufreq_init_750FX (struct device_node *cpunode) {struct device_node *volt_gpio_np;u32 pvr, *value;
arch/ppc/platforms/pmac_feature.c +88 -88
610 lines not on this page · raw message
arch/ppc/platforms/pmac_nvram.c +21 -21
158 lines not on this page · raw message
arch/ppc/platforms/pmac_pci.c +11 -11
@@ -141,7 +141,7 @@ fixup_bus_range(struct device_node *brid |(((unsigned long)(off)) & 0xFCUL) \ |1UL) -static void volatile __iomem * __pmac +static void volatile __iomem *macrisc_cfg_access (struct pci_controller * hose,u8 bus,u8 dev_fn,u8 offset) {unsigned int caddr;
@@ -162,7 +162,7 @@ macrisc_cfg_access(struct pci_controllerreturn hose->cfg_data + offset; } -static int __pmac +static int macrisc_read_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 *val) {
@@ -190,7 +190,7 @@ macrisc_read_config(struct pci_bus *bus,return PCIBIOS_SUCCESSFUL ; } -static int __pmac +static int macrisc_write_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 val) {
@@ -230,7 +230,7 @@ static struct pci_ops macrisc_pci_ops =/* * Verifiy that a specific (bus, dev_fn) exists on chaos */ -static int __pmac +static int chaos_validate_dev (struct pci_bus *bus,int devfn,int offset) {struct device_node *np;
@@ -252,7 +252,7 @@ chaos_validate_dev(struct pci_bus *bus,return PCIBIOS_SUCCESSFUL ; } -static int __pmac +static int chaos_read_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 *val) {
@@ -264,7 +264,7 @@ chaos_read_config(struct pci_bus *bus, ureturn macrisc_read_config (bus, devfn, offset, len, val); } -static int __pmac +static int chaos_write_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 val) {
@@ -294,7 +294,7 @@ static struct pci_ops chaos_pci_ops = + (((unsigned long)bus) << 16) \ + 0x01000000UL) -static void volatile __iomem * __pmac +static void volatile __iomem *u3_ht_cfg_access (struct pci_controller * hose,u8 bus,u8 devfn,u8 offset) {if (bus == hose->first_busno) {
@@ -307,7 +307,7 @@ u3_ht_cfg_access(struct pci_controller*return hose->cfg_data +U3_HT_CFA1 (bus, devfn, offset); } -static int __pmac +static int u3_ht_read_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 *val) {
@@ -357,7 +357,7 @@ u3_ht_read_config(struct pci_bus *bus, ureturn PCIBIOS_SUCCESSFUL ; } -static int __pmac +static int u3_ht_write_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 val) {
@@ -899,7 +899,7 @@ pmac_pcibios_fixup(void)pcibios_fixup_OF_interrupts (); } -int __pmac +int pmac_pci_enable_device_hook (struct pci_dev *dev,int initial) {struct device_node * node;
@@ -1096,7 +1096,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_* Disable second function on K2-SATA, it's broken * and disable IO BARs on first one */ -void __pmac pmac_pci_fixup_k2_sata(struct pci_dev* dev) +void pmac_pci_fixup_k2_sata (struct pci_dev * dev) {int i;u16 cmd;
arch/ppc/platforms/pmac_pic.c +13 -13
@@ -53,7 +53,7 @@ struct pmac_irq_hw { };/* Default addresses */ -static volatile struct pmac_irq_hw *pmac_irq_hw[4] __pmacdata = { +static volatile struct pmac_irq_hw *pmac_irq_hw[4 ] = { (struct pmac_irq_hw *)0xf3000020 , (struct pmac_irq_hw *)0xf3000010 , (struct pmac_irq_hw *)0xf4000020 ,
@@ -64,22 +64,22 @@ static volatile struct pmac_irq_hw *pmac#define OHARE_LEVEL_MASK 0x1ff00000#define HEATHROW_LEVEL_MASK 0x1ff00000 -static int max_irqs __pmacdata; -static int max_real_irqs __pmacdata; -static u32 level_mask[4] __pmacdata; +static int max_irqs; +static int max_real_irqs; +static u32 level_mask[4 ]; -static DEFINE_SPINLOCK(pmac_pic_lock __pmacdata); +static DEFINE_SPINLOCK (pmac_pic_lock);#define GATWICK_IRQ_POOL_SIZE 10 -static struct interrupt_info gatwick_int_pool[GATWICK_IRQ_POOL_SIZE] __pmacdata; +static struct interrupt_info gatwick_int_pool[GATWICK_IRQ_POOL_SIZE ];/* * Mark an irq as "lost". This is only used on the pmac * since it can lose interrupts (see pmac_set_irq_mask). * -- Cort */ -void __pmac +void __set_lost (unsigned long irq_nr,int nokick) {if (!test_and_set_bit (irq_nr, ppc_lost_interrupts)) {
@@ -89,7 +89,7 @@ __set_lost(unsigned long irq_nr, int nok } } -static void __pmac +static void pmac_mask_and_ack_irq (unsigned int irq_nr) {unsigned long bit =1UL << (irq_nr &0x1f );
@@ -114,7 +114,7 @@ pmac_mask_and_ack_irq(unsigned int irq_nspin_unlock_irqrestore (&pmac_pic_lock, flags); } -static void __pmac pmac_set_irq_mask(unsigned int irq_nr, int nokicklost) +static void pmac_set_irq_mask (unsigned int irq_nr,int nokicklost) {unsigned long bit =1UL << (irq_nr &0x1f );int i = irq_nr >>5 ;
@@ -147,7 +147,7 @@ static void __pmac pmac_set_irq_mask(uns/* When an irq gets requested for the first client, if it's an * edge interrupt, we clear any previous one on the controller */ -static unsigned int __pmac pmac_startup_irq(unsigned int irq_nr) +static unsigned int pmac_startup_irq (unsigned int irq_nr) {unsigned long bit =1UL << (irq_nr &0x1f );int i = irq_nr >>5 ;
@@ -160,20 +160,20 @@ static unsigned int __pmac pmac_startup_return 0 ; } -static void __pmac pmac_mask_irq(unsigned int irq_nr) +static void pmac_mask_irq (unsigned int irq_nr) {clear_bit (irq_nr, ppc_cached_irq_mask);pmac_set_irq_mask (irq_nr,0 );mb (); } -static void __pmac pmac_unmask_irq(unsigned int irq_nr) +static void pmac_unmask_irq (unsigned int irq_nr) {set_bit (irq_nr, ppc_cached_irq_mask);pmac_set_irq_mask (irq_nr,0 ); } -static void __pmac pmac_end_irq(unsigned int irq_nr) +static void pmac_end_irq (unsigned int irq_nr) {if (!(irq_desc[irq_nr].status & (IRQ_DISABLED |IRQ_INPROGRESS )) && irq_desc[irq_nr].action) {
arch/ppc/platforms/pmac_setup.c +6 -6
@@ -123,7 +123,7 @@ extern struct smp_ops_t psurge_smp_ops;extern struct smp_ops_t core99_smp_ops;#endif /* CONFIG_SMP */ -static int __pmac +static int pmac_show_cpuinfo (struct seq_file *m) {struct device_node *np;
@@ -227,7 +227,7 @@ pmac_show_cpuinfo(struct seq_file *m)return 0 ; } -static int __openfirmware +static int pmac_show_percpuinfo (struct seq_file *m,int i) {#ifdef CONFIG_CPU_FREQ_PMAC
@@ -486,7 +486,7 @@ static int pmac_late_init(void)late_initcall (pmac_late_init);/* can't be __init - can be called whenever a disk is first accessed */ -void __pmac +void note_bootable_part (dev_t dev,int part,int goodness) {static int found_boot =0 ;
@@ -512,7 +512,7 @@ note_bootable_part(dev_t dev, int part, } } -static void __pmac +static void pmac_restart (char *cmd) {#ifdef CONFIG_ADB_CUDA
@@ -537,7 +537,7 @@ pmac_restart(char *cmd) } } -static void __pmac +static void pmac_power_off (void ) {#ifdef CONFIG_ADB_CUDA
@@ -562,7 +562,7 @@ pmac_power_off(void) } } -static void __pmac +static void pmac_halt (void ) {pmac_power_off ();
arch/ppc/platforms/pmac_smp.c +5 -5
@@ -186,7 +186,7 @@ static inline void psurge_clr_ipi(int cp*/ static unsigned long psurge_smp_message[NR_CPUS ]; -void __pmac psurge_smp_message_recv(struct pt_regs *regs) +void psurge_smp_message_recv (struct pt_regs *regs) {int cpu =smp_processor_id ();int msg;
@@ -203,13 +203,13 @@ void __pmac psurge_smp_message_recv(strusmp_message_recv (msg, regs); } -irqreturn_t __pmac psurge_primary_intr(int irq, void *d, struct pt_regs *regs) +irqreturn_t psurge_primary_intr (int irq,void *d,struct pt_regs *regs) {psurge_smp_message_recv (regs);return IRQ_HANDLED ; } -static void __pmac smp_psurge_message_pass(int target, int msg, unsigned long data, +static void smp_psurge_message_pass (int target,int msg,unsigned long data,int wait) {int i;
@@ -629,7 +629,7 @@ void smp_core99_give_timebase(void)/* PowerSurge-style Macs */ -struct smp_ops_t psurge_smp_ops __pmacdata = { +struct smp_ops_t psurge_smp_ops = { .message_pass = smp_psurge_message_pass, .probe = smp_psurge_probe, .kick_cpu = smp_psurge_kick_cpu,
@@ -639,7 +639,7 @@ struct smp_ops_t psurge_smp_ops __pmacda };/* Core99 Macs (dual G4s) */ -struct smp_ops_t core99_smp_ops __pmacdata = { +struct smp_ops_t core99_smp_ops = { .message_pass = smp_openpic_message_pass, .probe = smp_core99_probe, .kick_cpu = smp_core99_kick_cpu,
arch/ppc/platforms/pmac_time.c +4 -4
@@ -77,7 +77,7 @@ pmac_time_init(void)#endif } -unsigned long __pmac +unsigned long pmac_get_rtc_time (void ) {#if defined(CONFIG_ADB_CUDA ) || defined(CONFIG_ADB_PMU )
@@ -118,7 +118,7 @@ pmac_get_rtc_time(void)return 0 ; } -int __pmac +int pmac_set_rtc_time (unsigned long nowtime) {#if defined(CONFIG_ADB_CUDA ) || defined(CONFIG_ADB_PMU )
@@ -210,7 +210,7 @@ via_calibrate_decr(void)/* * Reset the time after a sleep. */ -static int __pmac +static int time_sleep_notify (struct pmu_sleep_notifier *self,int when) {static unsigned long time_diff;
@@ -235,7 +235,7 @@ time_sleep_notify(struct pmu_sleep_notif return PBOOK_SLEEP_OK; } -static struct pmu_sleep_notifier time_sleep_notifier __pmacdata = { +static struct pmu_sleep_notifier time_sleep_notifier = { time_sleep_notify,SLEEP_LEVEL_MISC , };#endif /* CONFIG_PM */
arch/ppc/platforms/prep_pci.c +32 -32
255 lines not on this page · raw message
arch/ppc/platforms/prep_setup.c +22 -22
166 lines not on this page · raw message
arch/ppc/platforms/residual.c +1 -1
@@ -47,7 +47,7 @@#include <asm/ide.h> -unsigned char __res[sizeof(RESIDUAL)] __prepdata = {0,}; +unsigned char __res[sizeof (RESIDUAL )] = {0 ,};RESIDUAL *res = (RESIDUAL *)&__res;char * PnP_BASE_TYPES[]__initdata = {
arch/ppc/syslib/btext.c +3 -3
@@ -53,8 +53,8 @@ extern char *klimit;* chrp only uses it during early boot. */ #ifdef CONFIG_XMON -#define BTEXT __pmac -#define BTDATA __pmacdata +#define BTEXT +#define BTDATA #else #define BTEXT __init#define BTDATA __initdata
@@ -187,7 +187,7 @@ btext_setup_display(int width, int heigh* changes. */ -void __openfirmware +void map_boot_text (void ) {unsigned long base, offset, size;
arch/ppc/syslib/prep_nvram.c +5 -8
@@ -22,14 +22,14 @@static char nvramData[MAX_PREP_NVRAM ];static NVRAM_MAP *nvram=(NVRAM_MAP *)&nvramData[0 ]; -unsigned char __prep prep_nvram_read_val(int addr) +unsigned char prep_nvram_read_val (int addr) {outb (addr,PREP_NVRAM_AS0 );outb (addr>>8 ,PREP_NVRAM_AS1 );return inb (PREP_NVRAM_DATA ); } -void __prep prep_nvram_write_val(int addr, +void prep_nvram_write_val (int addr,unsigned char val) {outb (addr,PREP_NVRAM_AS0 );
@@ -81,8 +81,7 @@ void __init init_prep_nvram(void) } } -__prep -char __prep *prep_nvram_get_var(const char *name) +char *prep_nvram_get_var (const char *name) {char *cp;int namelen;
@@ -101,8 +100,7 @@ char __prep *prep_nvram_get_var(const chreturn NULL ; } -__prep -char __prep *prep_nvram_first_var(void) +char *prep_nvram_first_var (void ) {if (nvram->Header.GELength ==0 ) {return NULL ;
@@ -112,8 +110,7 @@ char __prep *prep_nvram_first_var(void) } } -__prep -char __prep *prep_nvram_next_var(char *name) +char *prep_nvram_next_var (char *name) {char *cp;
arch/ppc/syslib/prom.c +9 -9
@@ -89,7 +89,7 @@ extern char cmd_line[512]; /* XXX */extern boot_infos_t *boot_infos;unsigned long dev_tree_size; -void __openfirmware +void phys_call_rtas (int service,int nargs,int nret, ...) {va_list list;
@@ -862,7 +862,7 @@ find_type_devices(const char *type)/* * Returns all nodes linked together */ -struct device_node * __openfirmware +struct device_node *find_all_nodes (void ) {struct device_node *head, **prevp, *np;
@@ -1165,7 +1165,7 @@ get_property(struct device_node *np, con/* * Add a property to a node */ -void __openfirmware +void prom_add_property (struct device_node * np,struct property * prop) {struct property **next = &np->properties;
@@ -1177,7 +1177,7 @@ prom_add_property(struct device_node* np }/* I quickly hacked that one, check against spec ! */ -static inline unsigned long __openfirmware +static inline unsigned long bus_space_to_resource_flags (unsigned int bus_space) {u8 space = (bus_space >>24 ) &0xf ;
@@ -1194,7 +1194,7 @@ bus_space_to_resource_flags(unsigned int } } -static struct resource* __openfirmware +static struct resource *find_parent_pci_resource (struct pci_dev * pdev,struct address_range *range) {unsigned long mask;
@@ -1224,7 +1224,7 @@ find_parent_pci_resource(struct pci_dev** or other nodes attached to the root node. Ultimately, put some * link to resources in the OF node. */ -struct resource* __openfirmware +struct resource *request_OF_resource (struct device_node * node,int index,const char * name_postfix) {struct pci_dev * pcidev;
@@ -1280,7 +1280,7 @@ fail:return NULL ; } -int __openfirmware +int release_OF_resource (struct device_node * node,int index) {struct pci_dev * pcidev;
@@ -1346,7 +1346,7 @@ release_OF_resource(struct device_node* }#if 0 -void __openfirmware +void print_properties (struct device_node *np) {struct property *pp;
@@ -1400,7 +1400,7 @@ print_properties(struct device_node *np)static DEFINE_SPINLOCK (rtas_lock);/* this can be called after setup -- Cort */ -int __openfirmware +int call_rtas (const char *service,int nargs,int nret,unsigned long *outputs, ...) {
Re: PATCH powerpc: 02/04 Remove sections use from ppc64 and drivers
In reply to Jon Loeligerarch/ppc64/kernel/pmac_feature.c +30 -30
@@ -53,7 +53,7 @@* We use a single global lock to protect accesses. Each driver has * to take care of its own locking */ -static DEFINE_SPINLOCK(feature_lock __pmacdata); +static DEFINE_SPINLOCK (feature_lock);#define LOCK (flags) spin_lock_irqsave(&feature_lock, flags);#define UNLOCK (flags) spin_unlock_irqrestore(&feature_lock, flags);
@@ -62,9 +62,9 @@ static DEFINE_SPINLOCK(feature_lock __p/* * Instance of some macio stuffs */ -struct macio_chip macio_chips[MAX_MACIO_CHIPS] __pmacdata; +struct macio_chip macio_chips[MAX_MACIO_CHIPS ] ; -struct macio_chip* __pmac macio_find(struct device_node* child, int type) +struct macio_chip *macio_find (struct device_node * child,int type) {while (child) {int i;
@@ -79,7 +79,7 @@ struct macio_chip* __pmac macio_find(str }EXPORT_SYMBOL_GPL (macio_find); -static const char* macio_names[] __pmacdata = +static const char * macio_names[] = {"Unknown" ,"Grand Central" ,
@@ -106,9 +106,9 @@ static const char* macio_names[] __pmacd#define UN_BIS (r,v) (UN_OUT((r), UN_IN(r) | (v)))#define UN_BIC (r,v) (UN_OUT((r), UN_IN(r) & ~(v))) -static struct device_node* uninorth_node __pmacdata; -static u32* uninorth_base __pmacdata; -static u32 uninorth_rev __pmacdata; +static struct device_node * uninorth_node; +static u32 * uninorth_base; +static u32 uninorth_rev;static void *u3_ht;extern struct device_node *k2_skiplist[2 ];
@@ -133,14 +133,14 @@ struct pmac_mb_defstruct feature_table_entry * features;unsigned long board_flags; }; -static struct pmac_mb_def pmac_mb __pmacdata; +static struct pmac_mb_def pmac_mb;/* * Here are the chip specific feature functions */ -static long __pmac g5_read_gpio (struct device_node * node,long param,long value) +static long g5_read_gpio (struct device_node * node,long param,long value) {struct macio_chip * macio = &macio_chips[0 ];
@@ -148,7 +148,7 @@ static long __pmac g5_read_gpio(struct d } -static long __pmac g5_write_gpio (struct device_node * node,long param,long value) +static long g5_write_gpio (struct device_node * node,long param,long value) {struct macio_chip * macio = &macio_chips[0 ];
@@ -156,7 +156,7 @@ static long __pmac g5_write_gpio(structreturn 0 ; } -static long __pmac g5_gmac_enable (struct device_node * node,long param,long value) +static long g5_gmac_enable (struct device_node * node,long param,long value) {struct macio_chip * macio = &macio_chips[0 ];unsigned long flags;
@@ -181,7 +181,7 @@ static long __pmac g5_gmac_enable(structreturn 0 ; } -static long __pmac g5_fw_enable (struct device_node * node,long param,long value) +static long g5_fw_enable (struct device_node * node,long param,long value) {struct macio_chip * macio = &macio_chips[0 ];unsigned long flags;
@@ -206,7 +206,7 @@ static long __pmac g5_fw_enable(struct dreturn 0 ; } -static long __pmac g5_mpic_enable (struct device_node * node,long param,long value) +static long g5_mpic_enable (struct device_node * node,long param,long value) {unsigned long flags;
@@ -220,7 +220,7 @@ static long __pmac g5_mpic_enable(structreturn 0 ; } -static long __pmac g5_eth_phy_reset (struct device_node * node,long param,long value) +static long g5_eth_phy_reset (struct device_node * node,long param,long value) {struct macio_chip * macio = &macio_chips[0 ];struct device_node *phy;
@@ -250,7 +250,7 @@ static long __pmac g5_eth_phy_reset(strureturn 0 ; } -static long __pmac g5_i2s_enable (struct device_node *node,long param,long value) +static long g5_i2s_enable (struct device_node *node,long param,long value) {/* Very crude implementation for now */ struct macio_chip * macio = &macio_chips[0 ];
@@ -275,7 +275,7 @@ static long __pmac g5_i2s_enable(struct#ifdef CONFIG_SMP -static long __pmac g5_reset_cpu (struct device_node * node,long param,long value) +static long g5_reset_cpu (struct device_node * node,long param,long value) {unsigned int reset_io =0 ;unsigned long flags;
@@ -320,12 +320,12 @@ static long __pmac g5_reset_cpu(struct d* This takes the second CPU off the bus on dual CPU machines * running UP */ -void __pmac g5_phy_disable_cpu1(void) +void g5_phy_disable_cpu1 (void ) {UN_OUT (U3_API_PHY_CONFIG_1 ,0 ); } -static long __pmac generic_get_mb_info (struct device_node * node,long param,long value) +static long generic_get_mb_info (struct device_node * node,long param,long value) {switch (param) {case PMAC_MB_INFO_MODEL :
@@ -347,14 +347,14 @@ static long __pmac generic_get_mb_info(s/* Used on any machine */ -static struct feature_table_entry any_features[] __pmacdata = { +static struct feature_table_entry any_features[] = { {PMAC_FTR_GET_MB_INFO , generic_get_mb_info }, {0 ,NULL } };/* G5 features */ -static struct feature_table_entry g5_features[] __pmacdata = { +static struct feature_table_entry g5_features[] = { {PMAC_FTR_GMAC_ENABLE , g5_gmac_enable }, {PMAC_FTR_1394_ENABLE , g5_fw_enable }, {PMAC_FTR_ENABLE_MPIC , g5_mpic_enable },
@@ -368,7 +368,7 @@ static struct feature_table_entry g5_fea { 0, NULL } }; -static struct pmac_mb_def pmac_mb_defs[] __pmacdata = { +static struct pmac_mb_def pmac_mb_defs[] = { {"PowerMac7,2" ,"PowerMac G5" ,PMAC_TYPE_POWERMAC_G5 , g5_features,0 ,
@@ -394,7 +394,7 @@ static struct pmac_mb_def pmac_mb_defs[]/* * The toplevel feature_call callback */ -long __pmac pmac_do_feature_call (unsigned int selector, ...) +long pmac_do_feature_call (unsigned int selector, ...) {struct device_node * node;long param, value;
@@ -706,8 +706,8 @@ void __init pmac_check_ht_link(void)* Early video resume hook */ -static void (*pmac_early_vresume_proc)(void *data) __pmacdata; -static void *pmac_early_vresume_data __pmacdata; +static void (*pmac_early_vresume_proc)(void *data); +static void *pmac_early_vresume_data;void pmac_set_early_video_resume (void (*proc)(void *data),void *data) {
@@ -725,11 +725,11 @@ EXPORT_SYMBOL(pmac_set_early_video_resum* AGP related suspend/resume code */ -static struct pci_dev *pmac_agp_bridge __pmacdata; -static int (*pmac_agp_suspend)(struct pci_dev *bridge) __pmacdata; -static int (*pmac_agp_resume)(struct pci_dev *bridge) __pmacdata; +static struct pci_dev *pmac_agp_bridge; +static int (*pmac_agp_suspend)(struct pci_dev *bridge); +static int (*pmac_agp_resume)(struct pci_dev *bridge); -void __pmac pmac_register_agp_pm(struct pci_dev *bridge, +void pmac_register_agp_pm (struct pci_dev *bridge,int (*suspend)(struct pci_dev *bridge),int (*resume)(struct pci_dev *bridge)) {
@@ -746,7 +746,7 @@ void __pmac pmac_register_agp_pm(struct }EXPORT_SYMBOL (pmac_register_agp_pm); -void __pmac pmac_suspend_agp_for_card(struct pci_dev *dev) +void pmac_suspend_agp_for_card (struct pci_dev *dev) {if (pmac_agp_bridge ==NULL || pmac_agp_suspend ==NULL )return ;
@@ -756,7 +756,7 @@ void __pmac pmac_suspend_agp_for_card(st }EXPORT_SYMBOL (pmac_suspend_agp_for_card); -void __pmac pmac_resume_agp_for_card(struct pci_dev *dev) +void pmac_resume_agp_for_card (struct pci_dev *dev) {if (pmac_agp_bridge ==NULL || pmac_agp_resume ==NULL )return ;
arch/ppc64/kernel/pmac_nvram.c +15 -15
@@ -82,10 +82,10 @@ extern int system_running;static int (*core99_write_bank)(int bank,u8 * datas);static int (*core99_erase_bank)(int bank); -static char *nvram_image __pmacdata; +static char *nvram_image; -static ssize_t __pmac core99_nvram_read(char *buf, size_t count, loff_t *index) +static ssize_t core99_nvram_read (char *buf,size_t count,loff_t *index) {int i;
@@ -103,7 +103,7 @@ static ssize_t __pmac core99_nvram_read(return count; } -static ssize_t __pmac core99_nvram_write(char *buf, size_t count, loff_t *index) +static ssize_t core99_nvram_write (char *buf,size_t count,loff_t *index) {int i;
@@ -121,14 +121,14 @@ static ssize_t __pmac core99_nvram_writereturn count; } -static ssize_t __pmac core99_nvram_size(void) +static ssize_t core99_nvram_size (void ) {if (nvram_image ==NULL )return -ENODEV ;return NVRAM_SIZE ; } -static u8 __pmac chrp_checksum(struct chrp_header* hdr) +static u8 chrp_checksum (struct chrp_header * hdr) {u8 *ptr;u16 sum = hdr->signature;
@@ -139,7 +139,7 @@ static u8 __pmac chrp_checksum(struct chreturn sum; } -static u32 __pmac core99_calc_adler(u8 *buffer) +static u32 core99_calc_adler (u8 *buffer) {int cnt;u32 low, high;
@@ -161,7 +161,7 @@ static u32 __pmac core99_calc_adler(u8 *return (high <<16 ) | low; } -static u32 __pmac core99_check(u8* datas) +static u32 core99_check (u8 * datas) {struct core99_header * hdr99 = (struct core99_header *)datas;
@@ -180,7 +180,7 @@ static u32 __pmac core99_check(u8* datasreturn hdr99->generation; } -static int __pmac sm_erase_bank(int bank) +static int sm_erase_bank (int bank) {int stat, i;unsigned long timeout;
@@ -212,7 +212,7 @@ static int __pmac sm_erase_bank(int bankreturn 0 ; } -static int __pmac sm_write_bank(int bank, u8* datas) +static int sm_write_bank (int bank,u8 * datas) {int i, stat =0 ;unsigned long timeout;
@@ -247,7 +247,7 @@ static int __pmac sm_write_bank(int bankreturn 0 ; } -static int __pmac amd_erase_bank(int bank) +static int amd_erase_bank (int bank) {int i, stat =0 ;unsigned long timeout;
@@ -294,7 +294,7 @@ static int __pmac amd_erase_bank(int banreturn 0 ; } -static int __pmac amd_write_bank(int bank, u8* datas) +static int amd_write_bank (int bank,u8 * datas) {int i, stat =0 ;unsigned long timeout;
@@ -341,7 +341,7 @@ static int __pmac amd_write_bank(int ban } -static int __pmac core99_nvram_sync(void) +static int core99_nvram_sync (void ) {struct core99_header * hdr99;unsigned long flags;
@@ -431,7 +431,7 @@ int __init pmac_nvram_init(void)return 0 ; } -int __pmac pmac_get_partition(int partition) +int pmac_get_partition (int partition) {struct nvram_partition *part;const char *name;
@@ -459,7 +459,7 @@ int __pmac pmac_get_partition(int partitreturn part->index; } -u8 __pmac pmac_xpram_read(int xpaddr) +u8 pmac_xpram_read (int xpaddr) {int offset =pmac_get_partition (pmac_nvram_XPRAM);loff_t index;
@@ -476,7 +476,7 @@ u8 __pmac pmac_xpram_read(int xpaddr)return buf; } -void __pmac pmac_xpram_write(int xpaddr, u8 data) +void pmac_xpram_write (int xpaddr,u8 data) {int offset =pmac_get_partition (pmac_nvram_XPRAM);loff_t index;
arch/ppc64/kernel/pmac_pci.c +6 -6
@@ -121,7 +121,7 @@ static void __init fixup_bus_range(struc |(((unsigned long)(off)) & 0xFCUL) \ |1UL) -static unsigned long __pmac macrisc_cfg_access (struct pci_controller * hose, +static unsigned long macrisc_cfg_access (struct pci_controller * hose,u8 bus,u8 dev_fn,u8 offset) {unsigned int caddr;
@@ -142,7 +142,7 @@ static unsigned long __pmac macrisc_cfg_return ((unsigned long )hose->cfg_data) + offset; } -static int __pmac macrisc_read_config(struct pci_bus *bus, unsigned int devfn, +static int macrisc_read_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 *val) {struct pci_controller *hose;
@@ -173,7 +173,7 @@ static int __pmac macrisc_read_config(streturn PCIBIOS_SUCCESSFUL ; } -static int __pmac macrisc_write_config(struct pci_bus *bus, unsigned int devfn, +static int macrisc_write_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 val) {struct pci_controller *hose;
@@ -265,7 +265,7 @@ static int u3_ht_skip_device(struct pci_ + (((unsigned long)bus) << 16) \ + 0x01000000UL) -static unsigned long __pmac u3_ht_cfg_access (struct pci_controller * hose, +static unsigned long u3_ht_cfg_access (struct pci_controller * hose,u8 bus,u8 devfn,u8 offset) {if (bus == hose->first_busno) {
@@ -277,7 +277,7 @@ static unsigned long __pmac u3_ht_cfg_acreturn ((unsigned long )hose->cfg_data) +U3_HT_CFA1 (bus, devfn, offset); } -static int __pmac u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, +static int u3_ht_read_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 *val) {struct pci_controller *hose;
@@ -327,7 +327,7 @@ static int __pmac u3_ht_read_config(strureturn PCIBIOS_SUCCESSFUL ; } -static int __pmac u3_ht_write_config(struct pci_bus *bus, unsigned int devfn, +static int u3_ht_write_config (struct pci_bus *bus,unsigned int devfn,int offset,int len,u32 val) {struct pci_controller *hose;
arch/ppc64/kernel/pmac_setup.c +5 -5
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(smu_cmdbuf_abs);extern void udbg_init_scc (struct device_node *np); -static void __pmac pmac_show_cpuinfo(struct seq_file *m) +static void pmac_show_cpuinfo (struct seq_file *m) {struct device_node *np;char *pp;
@@ -210,7 +210,7 @@ static int pmac_late_init(void)late_initcall (pmac_late_init);/* can't be __init - can be called whenever a disk is first accessed */ -void __pmac note_bootable_part(dev_t dev, int part, int goodness) +void note_bootable_part (dev_t dev,int part,int goodness) {extern dev_t boot_dev;char *p;
@@ -231,7 +231,7 @@ void __pmac note_bootable_part(dev_t dev } } -static void __pmac pmac_restart(char *cmd) +static void pmac_restart (char *cmd) {switch (sys_ctrler) {#ifdef CONFIG_ADB_PMU
@@ -250,7 +250,7 @@ static void __pmac pmac_restart(char *cm } } -static void __pmac pmac_power_off(void) +static void pmac_power_off (void ) {switch (sys_ctrler) {#ifdef CONFIG_ADB_PMU
@@ -268,7 +268,7 @@ static void __pmac pmac_power_off(void) } } -static void __pmac pmac_halt(void) +static void pmac_halt (void ) {pmac_power_off (); }
arch/ppc64/kernel/pmac_smp.c +1 -1
@@ -310,7 +310,7 @@ static void __init smp_core99_setup_cpu( } } -struct smp_ops_t core99_smp_ops __pmacdata = { +struct smp_ops_t core99_smp_ops = { .message_pass = smp_mpic_message_pass, .probe = smp_core99_probe, .kick_cpu = smp_core99_kick_cpu,
arch/ppc64/kernel/pmac_time.c +2 -2
@@ -51,7 +51,7 @@extern struct timezone sys_tz;extern void to_tm (int tim,struct rtc_time * tm); -void __pmac pmac_get_rtc_time(struct rtc_time *tm) +void pmac_get_rtc_time (struct rtc_time *tm) {switch (sys_ctrler) {#ifdef CONFIG_ADB_PMU
@@ -92,7 +92,7 @@ void __pmac pmac_get_rtc_time(struct rtc } } -int __pmac pmac_set_rtc_time(struct rtc_time *tm) +int pmac_set_rtc_time (struct rtc_time *tm) {switch (sys_ctrler) {#ifdef CONFIG_ADB_PMU
drivers/ide/ppc/pmac.c +40 -40
317 lines not on this page · raw message
drivers/macintosh/ans-lcd.c +5 -5
@@ -27,7 +27,7 @@ static volatile unsigned char __iomem *a#undef DEBUG -static void __pmac +static void anslcd_write_byte_ctrl (unsigned char c ) {#ifdef DEBUG
@@ -43,14 +43,14 @@ anslcd_write_byte_ctrl ( unsigned char c } } -static void __pmac +static void anslcd_write_byte_data (unsigned char c ) {out_8 (anslcd_ptr +ANSLCD_DATA_IX , c);udelay (anslcd_short_delay); } -static ssize_t __pmac +static ssize_t anslcd_write (struct file * file,const char __user * buf,size_t count,loff_t *ppos ) {
@@ -73,7 +73,7 @@ anslcd_write( struct file * file, constreturn p - buf; } -static int __pmac +static int anslcd_ioctl (struct inode * inode,struct file * file,unsigned int cmd,unsigned long arg ) {
@@ -115,7 +115,7 @@ anslcd_ioctl( struct inode * inode, stru } } -static int __pmac +static int anslcd_open (struct inode * inode,struct file * file ) {return 0 ;
drivers/macintosh/mediabay.c +28 -28
209 lines not on this page · raw message
drivers/macintosh/via-cuda.c +0 -1
@@ -37,7 +37,6 @@ static DEFINE_SPINLOCK(cuda_lock);#ifdef CONFIG_MAC #define CUDA_IRQ IRQ_MAC_ADB -#define __openfirmware#define eieio ()#else #define CUDA_IRQ vias->intrs[0].line
drivers/macintosh/via-pmu.c +64 -65
501 lines not on this page · raw message
drivers/macintosh/via-pmu68k.c +7 -8
@@ -835,7 +835,7 @@ static struct pci_save { } *pbook_pci_saves;static int n_pbook_pci_saves; -static inline void __openfirmware +static inline void pbook_pci_save (void ) {int npci;
@@ -863,7 +863,7 @@ pbook_pci_save(void) } } -static inline void __openfirmware +static inline void pbook_pci_restore (void ) {u16 cmd;
@@ -902,7 +902,7 @@ pbook_pci_restore(void)#define IRQ_ENABLE ((unsigned int *)0xf3000024)#define MEM_CTRL ((unsigned int *)0xf8000070) -int __openfirmware powerbook_sleep(void) +int powerbook_sleep (void ) {int ret, i, x;static int save_backlight;
@@ -1001,25 +1001,24 @@ int __openfirmware powerbook_sleep(void)/* * Support for /dev/pmu device */ -static int __openfirmware pmu_open(struct inode *inode, struct file *file) +static int pmu_open (struct inode *inode,struct file *file) {return 0 ; } -static ssize_t __openfirmware pmu_read(struct file *file, char *buf, +static ssize_t pmu_read (struct file *file,char *buf,size_t count,loff_t *ppos) {return 0 ; } -static ssize_t __openfirmware pmu_write(struct file *file, const char *buf, +static ssize_t pmu_write (struct file *file,const char *buf,size_t count,loff_t *ppos) {return 0 ; } -/* Note: removed __openfirmware here since it causes link errors */ -static int /*__openfirmware*/ pmu_ioctl (struct inode * inode,struct file *filp, +static int pmu_ioctl (struct inode * inode,struct file *filp,u_int cmd,u_long arg) {int error;
Re: PATCH powerpc: 03/04 Remove section free() and linker script bits
In reply to Jon Loeligerarch/ppc/kernel/vmlinux.lds.S +0 -26
@@ -149,32 +149,6 @@ SECTIONS . = ALIGN(4096); _sextratext = .; - __pmac_begin = .; - .pmac.text : { *(.pmac.text) } - .pmac.data : { *(.pmac.data) } - . = ALIGN(4096); - __pmac_end = .; - - . = ALIGN(4096); - __prep_begin = .; - .prep.text : { *(.prep.text) } - .prep.data : { *(.prep.data) } - . = ALIGN(4096); - __prep_end = .; - - . = ALIGN(4096); - __chrp_begin = .; - .chrp.text : { *(.chrp.text) } - .chrp.data : { *(.chrp.data) } - . = ALIGN(4096); - __chrp_end = .; - - . = ALIGN(4096); - __openfirmware_begin = .; - .openfirmware.text : { *(.openfirmware.text) } - .openfirmware.data : { *(.openfirmware.data) } - . = ALIGN(4096); - __openfirmware_end = .; _eextratext = .; __bss_start = .;
arch/ppc/mm/init.c +0 -12
@@ -74,10 +74,6 @@ unsigned long agp_special_page;extern char _end[];extern char etext[], _stext[];extern char __init_begin, __init_end; -extern char __prep_begin, __prep_end; -extern char __chrp_begin, __chrp_end; -extern char __pmac_begin, __pmac_end; -extern char __openfirmware_begin, __openfirmware_end;#ifdef CONFIG_HIGHMEM pte_t *kmap_pte;
@@ -167,14 +163,6 @@ void free_initmem(void)printk ("Freeing unused kernel memory:" );FREESEC (init); -if (_machine != _MACH_Pmac) -FREESEC (pmac); -if (_machine != _MACH_chrp) -FREESEC (chrp); -if (_machine != _MACH_prep) -FREESEC (prep); -if (!have_of) -FREESEC (openfirmware);printk ("\n" ); ppc_md.progress =NULL ;#undef FREESEC
Re: PATCH powerpc: 04/04 Merge simplified sections.h into asm-powerpc
In reply to Jon Loeligerinclude/asm-powerpc/sections.h new file +20 -0
@@ -0,0 +1,20 @@ +#ifndef _ASM_POWERPC_SECTIONS_H +#define _ASM_POWERPC_SECTIONS_H + +#include <asm-generic/sections.h> + +#ifdef __powerpc64__ + +extern char _end[]; + +static inline int in_kernel_text (unsigned long addr) +{ +if (addr >= (unsigned long )_stext && addr < (unsigned long )__init_end) +return 1 ; + +return 0 ; +} + +#endif + +#endif /* _ASM_POWERPC_SECTIONS_H */
include/asm-ppc/sections.h deleted +0 -33
@@ -1,33 +0,0 @@ -#ifdef __KERNEL__ -#ifndef _PPC_SECTIONS_H -#define _PPC_SECTIONS_H - -#include <asm-generic/sections.h> - -#define __pmac __attribute__ ((__section__ (".pmac.text"))) -#define __pmacdata __attribute__ ((__section__ (".pmac.data"))) -#define __pmacfunc (__argpmac) \ - __argpmac __pmac; \ - __argpmac - -#define __prep __attribute__ ((__section__ (".prep.text"))) -#define __prepdata __attribute__ ((__section__ (".prep.data"))) -#define __prepfunc (__argprep) \ - __argprep __prep; \ - __argprep - -#define __chrp __attribute__ ((__section__ (".chrp.text"))) -#define __chrpdata __attribute__ ((__section__ (".chrp.data"))) -#define __chrpfunc (__argchrp) \ - __argchrp __chrp; \ - __argchrp - -/* this is actually just common chrp/pmac code, not OF code -- Cort */ -#define __openfirmware __attribute__ ((__section__ (".openfirmware.text"))) -#define __openfirmwaredata __attribute__ ((__section__ (".openfirmware.data"))) -#define __openfirmwarefunc (__argopenfirmware) \ - __argopenfirmware __openfirmware; \ - __argopenfirmware - -#endif /* _PPC_SECTIONS_H */ -#endif /* __KERNEL__ */
include/asm-ppc64/sections.h deleted +0 -29
@@ -1,29 +0,0 @@ -#ifndef _PPC64_SECTIONS_H -#define _PPC64_SECTIONS_H - -extern char _end[]; - -#include <asm-generic/sections.h> - -#define __pmac -#define __pmacdata - -#define __prep -#define __prepdata - -#define __chrp -#define __chrpdata - -#define __openfirmware -#define __openfirmwaredata - - -static inline int in_kernel_text (unsigned long addr) -{ -if (addr >= (unsigned long )_stext && addr < (unsigned long )__init_end) -return 1 ; - -return 0 ; -} - -#endif
Quoted 4 lines · Jon Loeliger
Here is a new patch that removes all notion of the pmac, prep, chrp and openfirmware initialization sections, and then unifies the
sections.hfiles without those__pmac, etc, sections identifiers cluttering things up.
When did we decide to do that ? Some people are still using ppc machines with rather small memory footprint (old ones), it's handy to get rid of the code you don't need... It would make sense if we could compile CHRP/PMAC/PREP in/out (like we can do with platforms on ppc64) so that people who have tight memory requirements can build a PReP or CHRP kernel without all of the pmac code.
Ben.
Quoted 8 lines · Benjamin Herrenschmidt
Quoted 5 lines · Jon Loeliger
Here is a new patch that removes all notion of the pmac, prep, chrp and openfirmware initialization sections, and then unifies the
sections.hfiles without those__pmac, etc, sections identifiers cluttering things up.
Quoted 6 lines
When did we decide to do that ? Some people are still using ppc machines with rather small memory footprint (old ones), it's handy to get rid of the code you don't need... It would make sense if we could compile CHRP/PMAC/PREP in/out (like we can do with platforms on ppc64) so that people who have tight memory requirements can build a PReP or CHRP kernel without all of the pmac code.
I think the discussion earlier in this week lead us to believe this was the way to go. We can provide a simple patch to allow selecting CHRP/PMAC/PREP specifically in addition to MUTLIPLATFORM.
- kumar
Quoted 4 lines
I think the discussion earlier in this week lead us to believe this was the way to go. We can provide a simple patch to allow selecting CHRP/PMAC/PREP specifically in addition to MUTLIPLATFORM.
It should be done like ppc64, that is MULTIPLATFORM can be built with an aribtrary "set" of platforms. In fact, I think the merged arch should trash if possible all "exclusive" CONFIG_MYBOARD stuff, but only ever do what ppc64 does, that is any combination of platforms for the same CPU family can be built at the same time.
Ben.