Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
946e91f3
Commit
946e91f3
authored
Sep 07, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
parents
f7402dc4
09bbe104
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
arch/sparc64/kernel/sunos_ioctl32.c
arch/sparc64/kernel/sunos_ioctl32.c
+5
-4
include/linux/serial_core.h
include/linux/serial_core.h
+2
-4
No files found.
arch/sparc64/kernel/sunos_ioctl32.c
View file @
946e91f3
...
...
@@ -152,11 +152,12 @@ asmlinkage int sunos_ioctl (int fd, u32 cmd, u32 arg)
ret
=
compat_sys_ioctl
(
fd
,
SIOCGIFCONF
,
arg
);
goto
out
;
case
_IOW
(
'i'
,
21
,
struct
ifreq
):
/* SIOCSIFMTU */
ret
=
sys_ioctl
(
fd
,
SIOCSIFMTU
,
arg
);
case
_IOW
(
'i'
,
21
,
struct
ifreq
32
):
ret
=
compat_
sys_ioctl
(
fd
,
SIOCSIFMTU
,
arg
);
goto
out
;
case
_IOWR
(
'i'
,
22
,
struct
ifreq
):
/* SIOCGIFMTU */
ret
=
sys_ioctl
(
fd
,
SIOCGIFMTU
,
arg
);
case
_IOWR
(
'i'
,
22
,
struct
ifreq32
):
ret
=
compat_sys_ioctl
(
fd
,
SIOCGIFMTU
,
arg
);
goto
out
;
case
_IOWR
(
'i'
,
23
,
struct
ifreq32
):
...
...
include/linux/serial_core.h
View file @
946e91f3
...
...
@@ -385,11 +385,11 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port);
/*
* The following are helper functions for the low level drivers.
*/
#ifdef SUPPORT_SYSRQ
static
inline
int
uart_handle_sysrq_char
(
struct
uart_port
*
port
,
unsigned
int
ch
,
struct
pt_regs
*
regs
)
{
#ifdef SUPPORT_SYSRQ
if
(
port
->
sysrq
)
{
if
(
ch
&&
time_before
(
jiffies
,
port
->
sysrq
))
{
handle_sysrq
(
ch
,
regs
,
NULL
);
...
...
@@ -398,11 +398,9 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch,
}
port
->
sysrq
=
0
;
}
#endif
return
0
;
}
#else
#define uart_handle_sysrq_char(port,ch,regs) (0)
#endif
/*
* We do the SysRQ and SAK checking like this...
...
...
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