Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18202
b: refs/heads/master
c: 8446196
h: refs/heads/master
v: v3
  • Loading branch information
Arnd Bergmann authored and Paul Mackerras committed Jan 12, 2006
1 parent 2f99a3c commit abcb10e
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b07dfab3e329955c218cd1d06efdb133c5c18ecd
refs/heads/master: 8446196ade39befe68f60cfae49c43b94a1144fc
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/platforms/pseries/hvcserver.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ MODULE_VERSION(HVCS_ARCH_VERSION);
* functions aren't performance sensitive, so this conversion isn't an
* issue.
*/
int hvcs_convert(long to_convert)
static int hvcs_convert(long to_convert)
{
switch (to_convert) {
case H_Success:
Expand Down Expand Up @@ -91,7 +91,7 @@ int hvcs_free_partner_info(struct list_head *head)
EXPORT_SYMBOL(hvcs_free_partner_info);

/* Helper function for hvcs_get_partner_info */
int hvcs_next_partner(uint32_t unit_address,
static int hvcs_next_partner(uint32_t unit_address,
unsigned long last_p_partition_ID,
unsigned long last_p_unit_address, unsigned long *pi_buff)

Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/powerpc/platforms/pseries/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@

#define DBG(fmt...)

extern int is_python(struct device_node *);

static void tce_build_pSeries(struct iommu_table *tbl, long index,
long npages, unsigned long uaddr,
enum dma_data_direction direction)
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/platforms/pseries/scanlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ struct file_operations scanlog_fops = {
.release = scanlog_release,
};

int __init scanlog_init(void)
static int __init scanlog_init(void)
{
struct proc_dir_entry *ent;

Expand Down Expand Up @@ -222,7 +222,7 @@ int __init scanlog_init(void)
return 0;
}

void __exit scanlog_cleanup(void)
static void __exit scanlog_cleanup(void)
{
if (proc_ppc64_scan_log_dump) {
kfree(proc_ppc64_scan_log_dump->data);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/platforms/pseries/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static void pseries_dedicated_idle(void);

struct mpic *pSeries_mpic;

void pSeries_show_cpuinfo(struct seq_file *m)
static void pSeries_show_cpuinfo(struct seq_file *m)
{
struct device_node *root;
const char *model = "";
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/platforms/pseries/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static int query_cpu_stopped(unsigned int pcpu)
return cpu_status;
}

int pSeries_cpu_disable(void)
static int pSeries_cpu_disable(void)
{
int cpu = smp_processor_id();

Expand All @@ -109,7 +109,7 @@ int pSeries_cpu_disable(void)
return 0;
}

void pSeries_cpu_die(unsigned int cpu)
static void pSeries_cpu_die(unsigned int cpu)
{
int tries;
int cpu_status;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/platforms/pseries/xics.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ int xics_get_irq(struct pt_regs *regs)

#ifdef CONFIG_SMP

irqreturn_t xics_ipi_action(int irq, void *dev_id, struct pt_regs *regs)
static irqreturn_t xics_ipi_action(int irq, void *dev_id, struct pt_regs *regs)
{
int cpu = smp_processor_id();

Expand Down

0 comments on commit abcb10e

Please sign in to comment.