git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
powerpc
/
kernel
/
nvram_64.c
diff --git
a/arch/powerpc/kernel/nvram_64.c
b/arch/powerpc/kernel/nvram_64.c
index
ada50aa
..
fd7db8d
100644
(file)
--- a/
arch/powerpc/kernel/nvram_64.c
+++ b/
arch/powerpc/kernel/nvram_64.c
@@
-160,7
+160,7
@@
static int dev_nvram_ioctl(struct inode *inode, struct file *file,
case IOC_NVRAM_GET_OFFSET: {
int part, offset;
case IOC_NVRAM_GET_OFFSET: {
int part, offset;
- if (
!machine_is(powermac)
)
+ if (
_machine != PLATFORM_POWERMAC
)
return -EINVAL;
if (copy_from_user(&part, (void __user*)arg, sizeof(part)) != 0)
return -EFAULT;
return -EINVAL;
if (copy_from_user(&part, (void __user*)arg, sizeof(part)) != 0)
return -EFAULT;
@@
-174,9
+174,8
@@
static int dev_nvram_ioctl(struct inode *inode, struct file *file,
return 0;
}
#endif /* CONFIG_PPC_PMAC */
return 0;
}
#endif /* CONFIG_PPC_PMAC */
- default:
- return -EINVAL;
}
}
+ return -EINVAL;
}
struct file_operations nvram_fops = {
}
struct file_operations nvram_fops = {
@@
-444,7
+443,7
@@
static int nvram_setup_partition(void)
* in our nvram, as Apple defined partitions use pretty much
* all of the space
*/
* in our nvram, as Apple defined partitions use pretty much
* all of the space
*/
- if (
machine_is(powermac)
)
+ if (
_machine == PLATFORM_POWERMAC
)
return -ENOSPC;
/* see if we have an OS partition that meets our needs.
return -ENOSPC;
/* see if we have an OS partition that meets our needs.