Skip to content

L
linux-davinci
Commit 96665822 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix SLB initialization at boot time
  [POWERPC] Fix undefined reference to device_power_up/resume
  [POWERPC] cell: Update cell_defconfig for 2.6.23
  [POWERPC] axonram: Do not delete gendisks queue in error path
  [POWERPC] axonram: Module modification for latest firmware API changes
  [POWERPC] cell: Support pinhole-reset on IBM cell blades
  [POWERPC] spu_manage: Use newer physical-id attribute
  [POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE
parents d96a2a5c 175587cc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 218 deletions
arch/powerpc/configs/cell_defconfig
View file @ 96665822
This diff is collapsed.
arch/powerpc/mm/slb.c
View file @ 96665822
...@@ -74,6 +74,22 @@ static inline void slb_shadow_clear(unsigned long entry) ...@@ -74,6 +74,22 @@ static inline void slb_shadow_clear(unsigned long entry)
get_slb_shadow()->save_area[entry].esid = 0; get_slb_shadow()->save_area[entry].esid = 0;
} }
static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags,
unsigned long entry)
{
/*
* Updating the shadow buffer before writing the SLB ensures
* we don't get a stale entry here if we get preempted by PHYP
* between these two statements.
*/
slb_shadow_update(ea, flags, entry);
asm volatile("slbmte %0,%1" :
: "r" (mk_vsid_data(ea, flags)),
"r" (mk_esid_data(ea, entry))
: "memory" );
}
void slb_flush_and_rebolt(void) void slb_flush_and_rebolt(void)
{ {
/* If you change this make sure you change SLB_NUM_BOLTED /* If you change this make sure you change SLB_NUM_BOLTED
...@@ -226,12 +242,16 @@ void slb_initialize(void) ...@@ -226,12 +242,16 @@ void slb_initialize(void)
vflags = SLB_VSID_KERNEL | vmalloc_llp; vflags = SLB_VSID_KERNEL | vmalloc_llp;
/* Invalidate the entire SLB (even slot 0) & all the ERATS */ /* Invalidate the entire SLB (even slot 0) & all the ERATS */
slb_shadow_update(PAGE_OFFSET, lflags, 0); asm volatile("isync":::"memory");
asm volatile("isync; slbia; sync; slbmte %0,%1; isync" :: asm volatile("slbmte %0,%0"::"r" (0) : "memory");
"r" (get_slb_shadow()->save_area[0].vsid), asm volatile("isync; slbia; isync":::"memory");
"r" (get_slb_shadow()->save_area[0].esid) : "memory"); create_shadowed_slbe(PAGE_OFFSET, lflags, 0);
slb_shadow_update(VMALLOC_START, vflags, 1); create_shadowed_slbe(VMALLOC_START, vflags, 1);
slb_flush_and_rebolt(); /* We don't bolt the stack for the time being - we're in boot,
* so the stack is in the bolted segment. By the time it goes
* elsewhere, we'll call _switch() which will bolt in the new
* one. */
asm volatile("isync":::"memory");
} }
arch/powerpc/platforms/cell/cbe_regs.h
View file @ 96665822
...@@ -113,10 +113,14 @@ struct cbe_pmd_regs { ...@@ -113,10 +113,14 @@ struct cbe_pmd_regs {
u64 checkstop_fir; /* 0x0c00 */ u64 checkstop_fir; /* 0x0c00 */
u64 recoverable_fir; /* 0x0c08 */ u64 recoverable_fir; /* 0x0c08 */
u64 spec_att_mchk_fir; /* 0x0c10 */ u64 spec_att_mchk_fir; /* 0x0c10 */
u64 fir_mode_reg; /* 0x0c18 */ u32 fir_mode_reg; /* 0x0c18 */
u8 pad_0x0c1c_0x0c20 [4]; /* 0x0c1c */
#define CBE_PMD_FIR_MODE_M8 0x00800
u64 fir_enable_mask; /* 0x0c20 */ u64 fir_enable_mask; /* 0x0c20 */
u8 pad_0x0c28_0x1000 [0x1000 - 0x0c28]; /* 0x0c28 */ u8 pad_0x0c28_0x0ca8 [0x0ca8 - 0x0c28]; /* 0x0c28 */
u64 ras_esc_0; /* 0x0ca8 */
u8 pad_0x0cb0_0x1000 [0x1000 - 0x0cb0]; /* 0x0cb0 */
}; };
extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np); extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np);
......
arch/powerpc/platforms/cell/cbe_thermal.c
View file @ 96665822
...@@ -88,17 +88,13 @@ static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev) ...@@ -88,17 +88,13 @@ static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)
/* returns the value for a given spu in a given register */ /* returns the value for a given spu in a given register */
static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg) static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg)
{ {
const unsigned int *id;
union spe_reg value; union spe_reg value;
struct spu *spu; struct spu *spu;
/* getting the id from the reg attribute will not work on future device-tree layouts
* in future we should store the id to the spu struct and use it here */
spu = container_of(sysdev, struct spu, sysdev); spu = container_of(sysdev, struct spu, sysdev);
id = of_get_property(spu_devnode(spu), "reg", NULL);
value.val = in_be64(&reg->val); value.val = in_be64(&reg->val);
return value.spe[*id]; return value.spe[spu->spe_id];
} }
static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf) static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf)
......
arch/powerpc/platforms/cell/pervasive.c
View file @ 96665822
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#include "pervasive.h" #include "pervasive.h"
#include "cbe_regs.h" #include "cbe_regs.h"
static int sysreset_hack;
static void cbe_power_save(void) static void cbe_power_save(void)
{ {
unsigned long ctrl, thread_switch_control; unsigned long ctrl, thread_switch_control;
...@@ -85,6 +87,9 @@ static void cbe_power_save(void) ...@@ -85,6 +87,9 @@ static void cbe_power_save(void)
static int cbe_system_reset_exception(struct pt_regs *regs) static int cbe_system_reset_exception(struct pt_regs *regs)
{ {
int cpu;
struct cbe_pmd_regs __iomem *pmd;
switch (regs->msr & SRR1_WAKEMASK) { switch (regs->msr & SRR1_WAKEMASK) {
case SRR1_WAKEEE: case SRR1_WAKEEE:
do_IRQ(regs); do_IRQ(regs);
...@@ -93,6 +98,18 @@ static int cbe_system_reset_exception(struct pt_regs *regs) ...@@ -93,6 +98,18 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
timer_interrupt(regs); timer_interrupt(regs);
break; break;
case SRR1_WAKEMT: case SRR1_WAKEMT:
/*
* The BMC can inject user triggered system reset exceptions,
* but cannot set the system reset reason in srr1,
* so check an extra register here.
*/
if (sysreset_hack && (cpu = smp_processor_id()) == 0) {
pmd = cbe_get_cpu_pmd_regs(cpu);
if (in_be64(&pmd->ras_esc_0) & 0xffff) {
out_be64(&pmd->ras_esc_0, 0);
return 0;
}
}
break; break;
#ifdef CONFIG_CBE_RAS #ifdef CONFIG_CBE_RAS
case SRR1_WAKESYSERR: case SRR1_WAKESYSERR:
...@@ -113,9 +130,12 @@ static int cbe_system_reset_exception(struct pt_regs *regs) ...@@ -113,9 +130,12 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
void __init cbe_pervasive_init(void) void __init cbe_pervasive_init(void)
{ {
int cpu; int cpu;
if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO)) if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO))
return; return;
sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu); struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu);
if (!regs) if (!regs)
...@@ -124,6 +144,12 @@ void __init cbe_pervasive_init(void) ...@@ -124,6 +144,12 @@ void __init cbe_pervasive_init(void)
/* Enable Pause(0) control bit */ /* Enable Pause(0) control bit */
out_be64(&regs->pmcr, in_be64(&regs->pmcr) | out_be64(&regs->pmcr, in_be64(&regs->pmcr) |
CBE_PMD_PAUSE_ZERO_CONTROL); CBE_PMD_PAUSE_ZERO_CONTROL);
/* Enable JTAG system-reset hack */
if (sysreset_hack)
out_be32(&regs->fir_mode_reg,
in_be32(&regs->fir_mode_reg) |
CBE_PMD_FIR_MODE_M8);
} }
ppc_md.power_save = cbe_power_save; ppc_md.power_save = cbe_power_save;
......
arch/powerpc/platforms/cell/spu_manage.c
View file @ 96665822
...@@ -48,7 +48,7 @@ static u64 __init find_spu_unit_number(struct device_node *spe) ...@@ -48,7 +48,7 @@ static u64 __init find_spu_unit_number(struct device_node *spe)
{ {
const unsigned int *prop; const unsigned int *prop;
int proplen; int proplen;
prop = of_get_property(spe, "unit-id", &proplen); prop = of_get_property(spe, "physical-id", &proplen);
if (proplen == 4) if (proplen == 4)
return (u64)*prop; return (u64)*prop;
......
arch/powerpc/platforms/pasemi/iommu.c
View file @ 96665822
...@@ -93,7 +93,7 @@ static void iobmap_build(struct iommu_table *tbl, long index, ...@@ -93,7 +93,7 @@ static void iobmap_build(struct iommu_table *tbl, long index,
pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr); pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr);
bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
ip = ((u32 *)tbl->it_base) + index; ip = ((u32 *)tbl->it_base) + index;
...@@ -118,7 +118,7 @@ static void iobmap_free(struct iommu_table *tbl, long index, ...@@ -118,7 +118,7 @@ static void iobmap_free(struct iommu_table *tbl, long index,
pr_debug("iobmap: free at: %lx, %lx\n", index, npages); pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
ip = ((u32 *)tbl->it_base) + index; ip = ((u32 *)tbl->it_base) + index;
...@@ -137,7 +137,7 @@ static void iommu_table_iobmap_setup(void) ...@@ -137,7 +137,7 @@ static void iommu_table_iobmap_setup(void)
iommu_table_iobmap.it_busno = 0; iommu_table_iobmap.it_busno = 0;
iommu_table_iobmap.it_offset = 0; iommu_table_iobmap.it_offset = 0;
/* it_size is in number of entries */ /* it_size is in number of entries */
iommu_table_iobmap.it_size = 0x80000000 >> PAGE_SHIFT; iommu_table_iobmap.it_size = 0x80000000 >> IOBMAP_PAGE_SHIFT;
/* Initialize the common IOMMU code */ /* Initialize the common IOMMU code */
iommu_table_iobmap.it_base = (unsigned long)iob_l2_base; iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;
......
arch/powerpc/sysdev/axonram.c
View file @ 96665822
...@@ -59,8 +59,7 @@ ...@@ -59,8 +59,7 @@
struct axon_ram_bank { struct axon_ram_bank {
struct of_device *device; struct of_device *device;
struct gendisk *disk; struct gendisk *disk;
unsigned int irq_correctable; unsigned int irq_id;
unsigned int irq_uncorrectable;
unsigned long ph_addr; unsigned long ph_addr;
unsigned long io_addr; unsigned long io_addr;
unsigned long size; unsigned long size;
...@@ -93,16 +92,9 @@ axon_ram_irq_handler(int irq, void *dev) ...@@ -93,16 +92,9 @@ axon_ram_irq_handler(int irq, void *dev)
BUG_ON(!bank); BUG_ON(!bank);
if (irq == bank->irq_correctable) {
dev_err(&device->dev, "Correctable memory error occured\n"); dev_err(&device->dev, "Correctable memory error occured\n");
bank->ecc_counter++; bank->ecc_counter++;
return IRQ_HANDLED; return IRQ_HANDLED;
} else if (irq == bank->irq_uncorrectable) {
dev_err(&device->dev, "Uncorrectable memory error occured\n");
panic("Critical ECC error on %s", device->node->full_name);
}
return IRQ_NONE;
} }
/** /**
...@@ -259,28 +251,18 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id) ...@@ -259,28 +251,18 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE); blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
add_disk(bank->disk); add_disk(bank->disk);
bank->irq_correctable = irq_of_parse_and_map(device->node, 0); bank->irq_id = irq_of_parse_and_map(device->node, 0);
bank->irq_uncorrectable = irq_of_parse_and_map(device->node, 1); if (bank->irq_id == NO_IRQ) {
if ((bank->irq_correctable <= 0) || (bank->irq_uncorrectable <= 0)) {
dev_err(&device->dev, "Cannot access ECC interrupt ID\n"); dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
rc = -EFAULT; rc = -EFAULT;
goto failed; goto failed;
} }
rc = request_irq(bank->irq_correctable, axon_ram_irq_handler, rc = request_irq(bank->irq_id, axon_ram_irq_handler,
AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
if (rc != 0) {
dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
bank->irq_correctable = bank->irq_uncorrectable = 0;
rc = -EFAULT;
goto failed;
}
rc = request_irq(bank->irq_uncorrectable, axon_ram_irq_handler,
AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device); AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
if (rc != 0) { if (rc != 0) {
dev_err(&device->dev, "Cannot register ECC interrupt handler\n"); dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
bank->irq_uncorrectable = 0; bank->irq_id = NO_IRQ;
rc = -EFAULT; rc = -EFAULT;
goto failed; goto failed;
} }
...@@ -296,13 +278,9 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id) ...@@ -296,13 +278,9 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
failed: failed:
if (bank != NULL) { if (bank != NULL) {
if (bank->irq_uncorrectable > 0) if (bank->irq_id != NO_IRQ)
free_irq(bank->irq_uncorrectable, device); free_irq(bank->irq_id, device);
if (bank->irq_correctable > 0)
free_irq(bank->irq_correctable, device);
if (bank->disk != NULL) { if (bank->disk != NULL) {
if (bank->disk->queue != NULL)
blk_cleanup_queue(bank->disk->queue);
if (bank->disk->major > 0) if (bank->disk->major > 0)
unregister_blkdev(bank->disk->major, unregister_blkdev(bank->disk->major,
bank->disk->disk_name); bank->disk->disk_name);
...@@ -329,9 +307,7 @@ axon_ram_remove(struct of_device *device) ...@@ -329,9 +307,7 @@ axon_ram_remove(struct of_device *device)
BUG_ON(!bank || !bank->disk); BUG_ON(!bank || !bank->disk);
device_remove_file(&device->dev, &dev_attr_ecc); device_remove_file(&device->dev, &dev_attr_ecc);
free_irq(bank->irq_uncorrectable, device); free_irq(bank->irq_id, device);
free_irq(bank->irq_correctable, device);
blk_cleanup_queue(bank->disk->queue);
unregister_blkdev(bank->disk->major, bank->disk->disk_name); unregister_blkdev(bank->disk->major, bank->disk->disk_name);
del_gendisk(bank->disk); del_gendisk(bank->disk);
iounmap((void __iomem *) bank->io_addr); iounmap((void __iomem *) bank->io_addr);
......
drivers/macintosh/adb.c
View file @ 96665822
...@@ -89,7 +89,7 @@ static int sleepy_trackpad; ...@@ -89,7 +89,7 @@ static int sleepy_trackpad;
static int autopoll_devs; static int autopoll_devs;
int __adb_probe_sync; int __adb_probe_sync;
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when); static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
static struct pmu_sleep_notifier adb_sleep_notifier = { static struct pmu_sleep_notifier adb_sleep_notifier = {
adb_notify_sleep, adb_notify_sleep,
...@@ -313,7 +313,7 @@ int __init adb_init(void) ...@@ -313,7 +313,7 @@ int __init adb_init(void)
printk(KERN_WARNING "Warning: no ADB interface detected\n"); printk(KERN_WARNING "Warning: no ADB interface detected\n");
adb_controller = NULL; adb_controller = NULL;
} else { } else {
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
pmu_register_sleep_notifier(&adb_sleep_notifier); pmu_register_sleep_notifier(&adb_sleep_notifier);
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
......
drivers/macintosh/via-pmu.c
View file @ 96665822
...@@ -152,10 +152,10 @@ static spinlock_t pmu_lock; ...@@ -152,10 +152,10 @@ static spinlock_t pmu_lock;
static u8 pmu_intr_mask; static u8 pmu_intr_mask;
static int pmu_version; static int pmu_version;
static int drop_interrupts; static int drop_interrupts;
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
static int option_lid_wakeup = 1; static int option_lid_wakeup = 1;
#endif /* CONFIG_PM && CONFIG_PPC32 */ #endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY) #if (defined(CONFIG_PM_SLEEP)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
static int sleep_in_progress; static int sleep_in_progress;
#endif #endif
static unsigned long async_req_locks; static unsigned long async_req_locks;
...@@ -875,7 +875,7 @@ proc_read_options(char *page, char **start, off_t off, ...@@ -875,7 +875,7 @@ proc_read_options(char *page, char **start, off_t off,
{ {
char *p = page; char *p = page;
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
if (pmu_kind == PMU_KEYLARGO_BASED && if (pmu_kind == PMU_KEYLARGO_BASED &&
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0) pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup); p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
...@@ -916,7 +916,7 @@ proc_write_options(struct file *file, const char __user *buffer, ...@@ -916,7 +916,7 @@ proc_write_options(struct file *file, const char __user *buffer,
*(val++) = 0; *(val++) = 0;
while(*val == ' ') while(*val == ' ')
val++; val++;
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
if (pmu_kind == PMU_KEYLARGO_BASED && if (pmu_kind == PMU_KEYLARGO_BASED &&
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0) pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
if (!strcmp(label, "lid_wakeup")) if (!strcmp(label, "lid_wakeup"))
...@@ -1738,7 +1738,7 @@ pmu_present(void) ...@@ -1738,7 +1738,7 @@ pmu_present(void)
return via != 0; return via != 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static LIST_HEAD(sleep_notifiers); static LIST_HEAD(sleep_notifiers);
...@@ -1769,9 +1769,9 @@ pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* n) ...@@ -1769,9 +1769,9 @@ pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* n)
return 0; return 0;
} }
EXPORT_SYMBOL(pmu_unregister_sleep_notifier); EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
#endif /* CONFIG_PM */ #endif /* CONFIG_PM_SLEEP */
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
/* Sleep is broadcast last-to-first */ /* Sleep is broadcast last-to-first */
static void broadcast_sleep(int when) static void broadcast_sleep(int when)
...@@ -2390,7 +2390,7 @@ powerbook_sleep_3400(void) ...@@ -2390,7 +2390,7 @@ powerbook_sleep_3400(void)
return 0; return 0;
} }
#endif /* CONFIG_PM && CONFIG_PPC32 */ #endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
/* /*
* Support for /dev/pmu device * Support for /dev/pmu device
...@@ -2573,7 +2573,7 @@ pmu_ioctl(struct inode * inode, struct file *filp, ...@@ -2573,7 +2573,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
int error = -EINVAL; int error = -EINVAL;
switch (cmd) { switch (cmd) {
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
case PMU_IOC_SLEEP: case PMU_IOC_SLEEP:
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EACCES; return -EACCES;
...@@ -2601,7 +2601,7 @@ pmu_ioctl(struct inode * inode, struct file *filp, ...@@ -2601,7 +2601,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
return put_user(0, argp); return put_user(0, argp);
else else
return put_user(1, argp); return put_user(1, argp);
#endif /* CONFIG_PM && CONFIG_PPC32 */ #endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
#ifdef CONFIG_PMAC_BACKLIGHT_LEGACY #ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
/* Compatibility ioctl's for backlight */ /* Compatibility ioctl's for backlight */
...@@ -2757,7 +2757,7 @@ pmu_polled_request(struct adb_request *req) ...@@ -2757,7 +2757,7 @@ pmu_polled_request(struct adb_request *req)
* to do suspend-to-disk. * to do suspend-to-disk.
*/ */
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
int pmu_sys_suspended; int pmu_sys_suspended;
...@@ -2792,7 +2792,7 @@ static int pmu_sys_resume(struct sys_device *sysdev) ...@@ -2792,7 +2792,7 @@ static int pmu_sys_resume(struct sys_device *sysdev)
return 0; return 0;
} }
#endif /* CONFIG_PM && CONFIG_PPC32 */ #endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
static struct sysdev_class pmu_sysclass = { static struct sysdev_class pmu_sysclass = {
set_kset_name("pmu"), set_kset_name("pmu"),
...@@ -2803,10 +2803,10 @@ static struct sys_device device_pmu = { ...@@ -2803,10 +2803,10 @@ static struct sys_device device_pmu = {
}; };
static struct sysdev_driver driver_pmu = { static struct sysdev_driver driver_pmu = {
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
.suspend = &pmu_sys_suspend, .suspend = &pmu_sys_suspend,
.resume = &pmu_sys_resume, .resume = &pmu_sys_resume,
#endif /* CONFIG_PM && CONFIG_PPC32 */ #endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
}; };
static int __init init_pmu_sysfs(void) static int __init init_pmu_sysfs(void)
...@@ -2841,10 +2841,10 @@ EXPORT_SYMBOL(pmu_wait_complete); ...@@ -2841,10 +2841,10 @@ EXPORT_SYMBOL(pmu_wait_complete);
EXPORT_SYMBOL(pmu_suspend); EXPORT_SYMBOL(pmu_suspend);
EXPORT_SYMBOL(pmu_resume); EXPORT_SYMBOL(pmu_resume);
EXPORT_SYMBOL(pmu_unlock); EXPORT_SYMBOL(pmu_unlock);
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
EXPORT_SYMBOL(pmu_enable_irled); EXPORT_SYMBOL(pmu_enable_irled);
EXPORT_SYMBOL(pmu_battery_count); EXPORT_SYMBOL(pmu_battery_count);
EXPORT_SYMBOL(pmu_batteries); EXPORT_SYMBOL(pmu_batteries);
EXPORT_SYMBOL(pmu_power_flags); EXPORT_SYMBOL(pmu_power_flags);
#endif /* CONFIG_PM && CONFIG_PPC32 */ #endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
include/linux/pmu.h
View file @ 96665822
...@@ -226,7 +226,7 @@ extern unsigned int pmu_power_flags; ...@@ -226,7 +226,7 @@ extern unsigned int pmu_power_flags;
extern void pmu_backlight_init(void); extern void pmu_backlight_init(void);
/* some code needs to know if the PMU was suspended for hibernation */ /* some code needs to know if the PMU was suspended for hibernation */
#if defined(CONFIG_PM) && defined(CONFIG_PPC32) #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
extern int pmu_sys_suspended; extern int pmu_sys_suspended;
#else #else
/* if power management is not configured it can't be suspended */ /* if power management is not configured it can't be suspended */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment