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
Kirill Smelkov
linux
Commits
6bc79455
Commit
6bc79455
authored
Apr 16, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix up some bitops due to strict type checking
parent
a5297c70
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
arch/i386/kernel/bluesmoke.c
arch/i386/kernel/bluesmoke.c
+2
-2
fs/binfmt_misc.c
fs/binfmt_misc.c
+1
-1
sound/core/seq/seq_queue.c
sound/core/seq/seq_queue.c
+3
-3
sound/core/seq/seq_queue.h
sound/core/seq/seq_queue.h
+1
-1
No files found.
arch/i386/kernel/bluesmoke.c
View file @
6bc79455
...
@@ -76,11 +76,11 @@ static void __init intel_init_thermal(struct cpuinfo_x86 *c)
...
@@ -76,11 +76,11 @@ static void __init intel_init_thermal(struct cpuinfo_x86 *c)
unsigned
int
cpu
=
smp_processor_id
();
unsigned
int
cpu
=
smp_processor_id
();
/* Thermal monitoring */
/* Thermal monitoring */
if
(
!
test_bit
(
X86_FEATURE_ACPI
,
&
c
->
x86_capability
))
if
(
!
test_bit
(
X86_FEATURE_ACPI
,
c
->
x86_capability
))
return
;
/* -ENODEV */
return
;
/* -ENODEV */
/* Clock modulation */
/* Clock modulation */
if
(
!
test_bit
(
X86_FEATURE_ACC
,
&
c
->
x86_capability
))
if
(
!
test_bit
(
X86_FEATURE_ACC
,
c
->
x86_capability
))
return
;
/* -ENODEV */
return
;
/* -ENODEV */
rdmsr
(
MSR_IA32_MISC_ENABLE
,
l
,
h
);
rdmsr
(
MSR_IA32_MISC_ENABLE
,
l
,
h
);
...
...
fs/binfmt_misc.c
View file @
6bc79455
...
@@ -38,7 +38,7 @@ enum {Enabled, Magic};
...
@@ -38,7 +38,7 @@ enum {Enabled, Magic};
typedef
struct
{
typedef
struct
{
struct
list_head
list
;
struct
list_head
list
;
int
flags
;
/* type, status, etc. */
unsigned
long
flags
;
/* type, status, etc. */
int
offset
;
/* offset of magic */
int
offset
;
/* offset of magic */
int
size
;
/* size of magic/mask */
int
size
;
/* size of magic/mask */
char
*
magic
;
/* magic or filename extension */
char
*
magic
;
/* magic or filename extension */
...
...
sound/core/seq/seq_queue.c
View file @
6bc79455
...
@@ -544,10 +544,10 @@ int snd_seq_queue_use(int queueid, int client, int use)
...
@@ -544,10 +544,10 @@ int snd_seq_queue_use(int queueid, int client, int use)
return
-
EINVAL
;
return
-
EINVAL
;
down
(
&
queue
->
timer_mutex
);
down
(
&
queue
->
timer_mutex
);
if
(
use
)
{
if
(
use
)
{
if
(
!
test_and_set_bit
(
client
,
&
queue
->
clients_bitmap
))
if
(
!
test_and_set_bit
(
client
,
queue
->
clients_bitmap
))
queue
->
clients
++
;
queue
->
clients
++
;
}
else
{
}
else
{
if
(
test_and_clear_bit
(
client
,
&
queue
->
clients_bitmap
))
if
(
test_and_clear_bit
(
client
,
queue
->
clients_bitmap
))
queue
->
clients
--
;
queue
->
clients
--
;
}
}
if
(
queue
->
clients
)
{
if
(
queue
->
clients
)
{
...
@@ -575,7 +575,7 @@ int snd_seq_queue_is_used(int queueid, int client)
...
@@ -575,7 +575,7 @@ int snd_seq_queue_is_used(int queueid, int client)
q
=
queueptr
(
queueid
);
q
=
queueptr
(
queueid
);
if
(
q
==
NULL
)
if
(
q
==
NULL
)
return
-
EINVAL
;
/* invalid queue */
return
-
EINVAL
;
/* invalid queue */
result
=
test_bit
(
client
,
&
q
->
clients_bitmap
)
?
1
:
0
;
result
=
test_bit
(
client
,
q
->
clients_bitmap
)
?
1
:
0
;
queuefree
(
q
);
queuefree
(
q
);
return
result
;
return
result
;
}
}
...
...
sound/core/seq/seq_queue.h
View file @
6bc79455
...
@@ -51,7 +51,7 @@ struct _snd_seq_queue {
...
@@ -51,7 +51,7 @@ struct _snd_seq_queue {
spinlock_t
check_lock
;
spinlock_t
check_lock
;
/* clients which uses this queue (bitmap) */
/* clients which uses this queue (bitmap) */
unsigned
int
clients_bitmap
[
SNDRV_SEQ_MAX_CLIENTS
/
sizeof
(
unsigned
int
)];
unsigned
long
clients_bitmap
[
SNDRV_SEQ_MAX_CLIENTS
/
sizeof
(
unsigned
long
)];
unsigned
int
clients
;
/* users of this queue */
unsigned
int
clients
;
/* users of this queue */
struct
semaphore
timer_mutex
;
struct
semaphore
timer_mutex
;
...
...
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