Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
0d613f5c
Commit
0d613f5c
authored
Jun 16, 2003
by
Patrick Mochel
Browse files
Options
Browse Files
Download
Plain Diff
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
parents
1bc211f1
3072d52b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
9 deletions
+16
-9
arch/i386/kernel/time.c
arch/i386/kernel/time.c
+5
-5
drivers/base/sys.c
drivers/base/sys.c
+0
-3
include/linux/sysdev.h
include/linux/sysdev.h
+0
-1
lib/kobject.c
lib/kobject.c
+11
-0
No files found.
arch/i386/kernel/time.c
View file @
0d613f5c
...
...
@@ -281,19 +281,19 @@ unsigned long get_cmos_time(void)
return
retval
;
}
static
struct
sysdev_class
rtc
_sysclass
=
{
set_kset_name
(
"
rtc
"
),
static
struct
sysdev_class
pit
_sysclass
=
{
set_kset_name
(
"
pit
"
),
};
/* XXX this driverfs stuff should probably go elsewhere later -john */
static
struct
sys_device
device_i8253
=
{
.
id
=
0
,
.
cls
=
&
rtc
_sysclass
,
.
id
=
0
,
.
cls
=
&
pit
_sysclass
,
};
static
int
time_init_device
(
void
)
{
int
error
=
sysdev_class_register
(
&
rtc
_sysclass
);
int
error
=
sysdev_class_register
(
&
pit
_sysclass
);
if
(
!
error
)
error
=
sys_device_register
(
&
device_i8253
);
return
error
;
...
...
drivers/base/sys.c
View file @
0d613f5c
...
...
@@ -218,9 +218,6 @@ void sys_device_unregister(struct sys_device * sysdev)
if
(
drv
->
remove
)
drv
->
remove
(
sysdev
);
}
list_del_init
(
&
sysdev
->
entry
);
up_write
(
&
system_subsys
.
rwsem
);
kobject_unregister
(
&
sysdev
->
kobj
);
...
...
include/linux/sysdev.h
View file @
0d613f5c
...
...
@@ -72,7 +72,6 @@ struct sys_device {
u32
id
;
struct
sysdev_class
*
cls
;
struct
kobject
kobj
;
struct
list_head
entry
;
};
extern
int
sys_device_register
(
struct
sys_device
*
);
...
...
lib/kobject.c
View file @
0d613f5c
...
...
@@ -100,6 +100,9 @@ static void fill_kobj_path(struct kset *kset, struct kobject *kobj, char *path,
#define BUFFER_SIZE 1024
/* should be enough memory for the env */
#define NUM_ENVP 32
/* number of env pointers */
static
unsigned
long
sequence_num
;
static
spinlock_t
sequence_lock
=
SPIN_LOCK_UNLOCKED
;
static
void
kset_hotplug
(
const
char
*
action
,
struct
kset
*
kset
,
struct
kobject
*
kobj
)
{
...
...
@@ -112,6 +115,7 @@ static void kset_hotplug(const char *action, struct kset *kset,
int
kobj_path_length
;
char
*
kobj_path
=
NULL
;
char
*
name
=
NULL
;
unsigned
long
seq
;
/* If the kset has a filter operation, call it. If it returns
failure, no hotplug event is required. */
...
...
@@ -152,6 +156,13 @@ static void kset_hotplug(const char *action, struct kset *kset,
envp
[
i
++
]
=
scratch
;
scratch
+=
sprintf
(
scratch
,
"ACTION=%s"
,
action
)
+
1
;
spin_lock
(
&
sequence_lock
);
seq
=
sequence_num
++
;
spin_unlock
(
&
sequence_lock
);
envp
[
i
++
]
=
scratch
;
scratch
+=
sprintf
(
scratch
,
"SEQNUM=%ld"
,
seq
)
+
1
;
kobj_path_length
=
get_kobj_path_length
(
kset
,
kobj
);
kobj_path
=
kmalloc
(
kobj_path_length
,
GFP_KERNEL
);
if
(
!
kobj_path
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment