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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
kernel
/
ppc_htab.c
diff --git
a/arch/ppc/kernel/ppc_htab.c
b/arch/ppc/kernel/ppc_htab.c
index
b5cd7e4
..
75c6450
100644
(file)
--- a/
arch/ppc/kernel/ppc_htab.c
+++ b/
arch/ppc/kernel/ppc_htab.c
@@
-16,6
+16,7
@@
#include <linux/proc_fs.h>
#include <linux/stat.h>
#include <linux/sysctl.h>
#include <linux/proc_fs.h>
#include <linux/stat.h>
#include <linux/sysctl.h>
+#include <linux/capability.h>
#include <linux/ctype.h>
#include <linux/threads.h>
#include <linux/smp_lock.h>
#include <linux/ctype.h>
#include <linux/threads.h>
#include <linux/smp_lock.h>
@@
-51,7
+52,7
@@
static int ppc_htab_open(struct inode *inode, struct file *file)
return single_open(file, ppc_htab_show, NULL);
}
return single_open(file, ppc_htab_show, NULL);
}
-struct file_operations ppc_htab_operations = {
+
const
struct file_operations ppc_htab_operations = {
.open = ppc_htab_open,
.read = seq_read,
.llseek = seq_lseek,
.open = ppc_htab_open,
.read = seq_read,
.llseek = seq_lseek,
@@
-103,12
+104,12
@@
static char *pmc2_lookup(unsigned long mmcr0)
static int ppc_htab_show(struct seq_file *m, void *v)
{
unsigned long mmcr0 = 0, pmc1 = 0, pmc2 = 0;
static int ppc_htab_show(struct seq_file *m, void *v)
{
unsigned long mmcr0 = 0, pmc1 = 0, pmc2 = 0;
-#if defined(CONFIG_PPC_STD_MMU)
&& !defined(CONFIG_PPC64BRIDGE)
+#if defined(CONFIG_PPC_STD_MMU)
unsigned int kptes = 0, uptes = 0;
PTE *ptr;
#endif /* CONFIG_PPC_STD_MMU */
unsigned int kptes = 0, uptes = 0;
PTE *ptr;
#endif /* CONFIG_PPC_STD_MMU */
- if (c
ur_cpu_spec[0]->cpu_features & CPU_FTR_604_PERF_MON
) {
+ if (c
pu_has_feature(CPU_FTR_604_PERF_MON)
) {
mmcr0 = mfspr(SPRN_MMCR0);
pmc1 = mfspr(SPRN_PMC1);
pmc2 = mfspr(SPRN_PMC2);
mmcr0 = mfspr(SPRN_MMCR0);
pmc1 = mfspr(SPRN_PMC1);
pmc2 = mfspr(SPRN_PMC2);
@@
-132,7
+133,6
@@
static int ppc_htab_show(struct seq_file *m, void *v)
return 0;
}
return 0;
}
-#ifndef CONFIG_PPC64BRIDGE
for (ptr = Hash; ptr < Hash_end; ptr++) {
unsigned int mctx, vsid;
for (ptr = Hash; ptr < Hash_end; ptr++) {
unsigned int mctx, vsid;
@@
-146,7
+146,6
@@
static int ppc_htab_show(struct seq_file *m, void *v)
else
uptes++;
}
else
uptes++;
}
-#endif
seq_printf(m,
"PTE Hash Table Information\n"
seq_printf(m,
"PTE Hash Table Information\n"
@@
-154,20
+153,16
@@
static int ppc_htab_show(struct seq_file *m, void *v)
"Buckets\t\t: %lu\n"
"Address\t\t: %08lx\n"
"Entries\t\t: %lu\n"
"Buckets\t\t: %lu\n"
"Address\t\t: %08lx\n"
"Entries\t\t: %lu\n"
-#ifndef CONFIG_PPC64BRIDGE
"User ptes\t: %u\n"
"Kernel ptes\t: %u\n"
"Percent full\t: %lu%%\n"
"User ptes\t: %u\n"
"Kernel ptes\t: %u\n"
"Percent full\t: %lu%%\n"
-#endif
, (unsigned long)(Hash_size>>10),
(Hash_size/(sizeof(PTE)*8)),
(unsigned long)Hash,
Hash_size/sizeof(PTE)
, (unsigned long)(Hash_size>>10),
(Hash_size/(sizeof(PTE)*8)),
(unsigned long)Hash,
Hash_size/sizeof(PTE)
-#ifndef CONFIG_PPC64BRIDGE
, uptes,
kptes,
((kptes+uptes)*100) / (Hash_size/sizeof(PTE))
, uptes,
kptes,
((kptes+uptes)*100) / (Hash_size/sizeof(PTE))
-#endif
);
seq_printf(m,
);
seq_printf(m,
@@
-209,7
+204,7
@@
static ssize_t ppc_htab_write(struct file * file, const char __user * ubuffer,
if ( !strncmp( buffer, "reset", 5) )
{
if ( !strncmp( buffer, "reset", 5) )
{
- if (c
ur_cpu_spec[0]->cpu_features & CPU_FTR_604_PERF_MON
) {
+ if (c
pu_has_feature(CPU_FTR_604_PERF_MON)
) {
/* reset PMC1 and PMC2 */
mtspr(SPRN_PMC1, 0);
mtspr(SPRN_PMC2, 0);
/* reset PMC1 and PMC2 */
mtspr(SPRN_PMC1, 0);
mtspr(SPRN_PMC2, 0);
@@
-221,7
+216,7
@@
static ssize_t ppc_htab_write(struct file * file, const char __user * ubuffer,
}
/* Everything below here requires the performance monitor feature. */
}
/* Everything below here requires the performance monitor feature. */
- if (
!cur_cpu_spec[0]->cpu_features & CPU_FTR_604_PERF_MON
)
+ if (
!cpu_has_feature(CPU_FTR_604_PERF_MON)
)
return count;
/* turn off performance monitoring */
return count;
/* turn off performance monitoring */
@@
-339,7
+334,7
@@
int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
"0.5", "1.0", "(reserved2)", "(reserved3)"
};
"0.5", "1.0", "(reserved2)", "(reserved3)"
};
- if (!
(cur_cpu_spec[0]->cpu_features &
CPU_FTR_L2CR))
+ if (!
cpu_has_feature(
CPU_FTR_L2CR))
return -EFAULT;
if ( /*!table->maxlen ||*/ (*ppos && !write)) {
return -EFAULT;
if ( /*!table->maxlen ||*/ (*ppos && !write)) {