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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
mca.c
diff --git
a/arch/i386/kernel/mca.c
b/arch/i386/kernel/mca.c
index
cd5456f
..
b83672b
100644
(file)
--- a/
arch/i386/kernel/mca.c
+++ b/
arch/i386/kernel/mca.c
@@
-42,6
+42,7
@@
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/mca.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/mca.h>
+#include <linux/kprobes.h>
#include <asm/system.h>
#include <asm/io.h>
#include <linux/proc_fs.h>
#include <asm/system.h>
#include <asm/io.h>
#include <linux/proc_fs.h>
@@
-282,10
+283,9
@@
static int __init mca_init(void)
bus->f.mca_transform_memory = mca_dummy_transform_memory;
/* get the motherboard device */
bus->f.mca_transform_memory = mca_dummy_transform_memory;
/* get the motherboard device */
- mca_dev = k
m
alloc(sizeof(struct mca_device), GFP_KERNEL);
+ mca_dev = k
z
alloc(sizeof(struct mca_device), GFP_KERNEL);
if(unlikely(!mca_dev))
goto out_nomem;
if(unlikely(!mca_dev))
goto out_nomem;
- memset(mca_dev, 0, sizeof(struct mca_device));
/*
* We do not expect many MCA interrupts during initialization,
/*
* We do not expect many MCA interrupts during initialization,
@@
-309,11
+309,9
@@
static int __init mca_init(void)
mca_dev->slot = MCA_MOTHERBOARD;
mca_register_device(MCA_PRIMARY_BUS, mca_dev);
mca_dev->slot = MCA_MOTHERBOARD;
mca_register_device(MCA_PRIMARY_BUS, mca_dev);
- mca_dev = k
m
alloc(sizeof(struct mca_device), GFP_ATOMIC);
+ mca_dev = k
z
alloc(sizeof(struct mca_device), GFP_ATOMIC);
if(unlikely(!mca_dev))
goto out_unlock_nomem;
if(unlikely(!mca_dev))
goto out_unlock_nomem;
- memset(mca_dev, 0, sizeof(struct mca_device));
-
/* Put motherboard into video setup mode, read integrated video
* POS registers, and turn motherboard setup off.
/* Put motherboard into video setup mode, read integrated video
* POS registers, and turn motherboard setup off.
@@
-348,10
+346,9
@@
static int __init mca_init(void)
}
if(which_scsi) {
/* found a scsi card */
}
if(which_scsi) {
/* found a scsi card */
- mca_dev = k
m
alloc(sizeof(struct mca_device), GFP_ATOMIC);
+ mca_dev = k
z
alloc(sizeof(struct mca_device), GFP_ATOMIC);
if(unlikely(!mca_dev))
goto out_unlock_nomem;
if(unlikely(!mca_dev))
goto out_unlock_nomem;
- memset(mca_dev, 0, sizeof(struct mca_device));
for(j = 0; j < 8; j++)
mca_dev->pos[j] = pos[j];
for(j = 0; j < 8; j++)
mca_dev->pos[j] = pos[j];
@@
-377,10
+374,9
@@
static int __init mca_init(void)
if(!mca_read_and_store_pos(pos))
continue;
if(!mca_read_and_store_pos(pos))
continue;
- mca_dev = k
m
alloc(sizeof(struct mca_device), GFP_ATOMIC);
+ mca_dev = k
z
alloc(sizeof(struct mca_device), GFP_ATOMIC);
if(unlikely(!mca_dev))
goto out_unlock_nomem;
if(unlikely(!mca_dev))
goto out_unlock_nomem;
- memset(mca_dev, 0, sizeof(struct mca_device));
for(j=0; j<8; j++)
mca_dev->pos[j]=pos[j];
for(j=0; j<8; j++)
mca_dev->pos[j]=pos[j];
@@
-414,7
+410,8
@@
subsys_initcall(mca_init);
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
-static void mca_handle_nmi_device(struct mca_device *mca_dev, int check_flag)
+static __kprobes void
+mca_handle_nmi_device(struct mca_device *mca_dev, int check_flag)
{
int slot = mca_dev->slot;
{
int slot = mca_dev->slot;
@@
-444,7
+441,7
@@
static void mca_handle_nmi_device(struct mca_device *mca_dev, int check_flag)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
-static int mca_handle_nmi_callback(struct device *dev, void *data)
+static int
__kprobes
mca_handle_nmi_callback(struct device *dev, void *data)
{
struct mca_device *mca_dev = to_mca_device(dev);
unsigned char pos5;
{
struct mca_device *mca_dev = to_mca_device(dev);
unsigned char pos5;
@@
-462,7
+459,7
@@
static int mca_handle_nmi_callback(struct device *dev, void *data)
return 0;
}
return 0;
}
-void mca_handle_nmi(void)
+void
__kprobes
mca_handle_nmi(void)
{
/* First try - scan the various adapters and see if a specific
* adapter was responsible for the error.
{
/* First try - scan the various adapters and see if a specific
* adapter was responsible for the error.