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
f2c2b294
Commit
f2c2b294
authored
20 years ago
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/wesolows/sparc32-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
parents
2f54b735
e899b4be
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
11 deletions
+15
-11
arch/sparc64/kernel/sys_sparc32.c
arch/sparc64/kernel/sys_sparc32.c
+2
-1
drivers/char/vt.c
drivers/char/vt.c
+3
-1
drivers/scsi/Kconfig
drivers/scsi/Kconfig
+1
-1
drivers/scsi/sata_via.c
drivers/scsi/sata_via.c
+1
-1
include/asm-sparc64/pgalloc.h
include/asm-sparc64/pgalloc.h
+7
-6
include/asm-x86_64/pci.h
include/asm-x86_64/pci.h
+1
-1
No files found.
arch/sparc64/kernel/sys_sparc32.c
View file @
f2c2b294
...
...
@@ -1089,7 +1089,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, i
{
struct
linux_dirent32
*
dirent
;
struct
getdents_callback32
*
buf
=
(
struct
getdents_callback32
*
)
__buf
;
int
reclen
=
ROUND_UP
(
NAME_OFFSET
(
dirent
)
+
namlen
+
1
);
int
reclen
=
ROUND_UP
(
NAME_OFFSET
(
dirent
)
+
namlen
+
2
);
buf
->
error
=
-
EINVAL
;
/* only used if we fail.. */
if
(
reclen
>
buf
->
count
)
...
...
@@ -1103,6 +1103,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, i
put_user
(
reclen
,
&
dirent
->
d_reclen
);
copy_to_user
(
dirent
->
d_name
,
name
,
namlen
);
put_user
(
0
,
dirent
->
d_name
+
namlen
);
put_user
(
d_type
,
(
char
*
)
dirent
+
reclen
-
1
);
((
char
*
)
dirent
)
+=
reclen
;
buf
->
current_dir
=
dirent
;
buf
->
count
-=
reclen
;
...
...
This diff is collapsed.
Click to expand it.
drivers/char/vt.c
View file @
f2c2b294
...
...
@@ -2487,11 +2487,13 @@ static void con_close(struct tty_struct *tty, struct file *filp)
if
(
tty
&&
tty
->
count
==
1
)
{
struct
vt_struct
*
vt
;
vcs_remove_devfs
(
tty
);
vt
=
tty
->
driver_data
;
if
(
vt
)
vc_cons
[
vt
->
vc_num
].
d
->
vc_tty
=
NULL
;
tty
->
driver_data
=
0
;
release_console_sem
();
vcs_remove_devfs
(
tty
);
return
;
}
release_console_sem
();
}
...
...
This diff is collapsed.
Click to expand it.
drivers/scsi/Kconfig
View file @
f2c2b294
...
...
@@ -443,7 +443,7 @@ config SCSI_SATA_PROMISE
config SCSI_SATA_SIL
tristate "Silicon Image SATA support"
depends on SCSI_SATA && PCI &&
BROKEN
depends on SCSI_SATA && PCI &&
EXPERIMENTAL
help
This option enables support for Silicon Image Serial ATA.
...
...
This diff is collapsed.
Click to expand it.
drivers/scsi/sata_via.c
View file @
f2c2b294
...
...
@@ -205,7 +205,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
INIT_LIST_HEAD
(
&
probe_ent
->
node
);
probe_ent
->
pdev
=
pdev
;
probe_ent
->
sht
=
&
svia_sht
;
probe_ent
->
host_flags
=
ATA_FLAG_SATA
|
ATA_FLAG_S
ATA_RESE
T
|
probe_ent
->
host_flags
=
ATA_FLAG_SATA
|
ATA_FLAG_S
RS
T
|
ATA_FLAG_NO_LEGACY
;
probe_ent
->
port_ops
=
&
svia_sata_ops
;
probe_ent
->
n_ports
=
2
;
...
...
This diff is collapsed.
Click to expand it.
include/asm-sparc64/pgalloc.h
View file @
f2c2b294
...
...
@@ -38,11 +38,12 @@ static __inline__ void free_pgd_fast(pgd_t *pgd)
preempt_disable
();
if
(
!
page
->
lru
.
prev
)
{
(
unsigned
long
*
)
page
->
lru
.
next
=
pgd_quicklist
;
page
->
lru
.
next
=
(
void
*
)
pgd_quicklist
;
pgd_quicklist
=
(
unsigned
long
*
)
page
;
}
(
unsigned
long
)
page
->
lru
.
prev
|=
(((
unsigned
long
)
pgd
&
(
PAGE_SIZE
/
2
))
?
2
:
1
);
page
->
lru
.
prev
=
(
void
*
)
(((
unsigned
long
)
page
->
lru
.
prev
)
|
(((
unsigned
long
)
pgd
&
(
PAGE_SIZE
/
2
))
?
2
:
1
));
pgd_cache_size
++
;
preempt_enable
();
}
...
...
@@ -62,7 +63,7 @@ static __inline__ pgd_t *get_pgd_fast(void)
off
=
PAGE_SIZE
/
2
;
mask
&=
~
2
;
}
(
unsigned
long
)
ret
->
lru
.
prev
=
mask
;
ret
->
lru
.
prev
=
(
void
*
)
mask
;
if
(
!
mask
)
pgd_quicklist
=
(
unsigned
long
*
)
ret
->
lru
.
next
;
ret
=
(
struct
page
*
)(
__page_address
(
ret
)
+
off
);
...
...
@@ -76,10 +77,10 @@ static __inline__ pgd_t *get_pgd_fast(void)
if
(
page
)
{
ret
=
(
struct
page
*
)
page_address
(
page
);
clear_page
(
ret
);
(
unsigned
long
)
page
->
lru
.
prev
=
2
;
page
->
lru
.
prev
=
(
void
*
)
2UL
;
preempt_disable
();
(
unsigned
long
*
)
page
->
lru
.
next
=
pgd_quicklist
;
page
->
lru
.
next
=
(
void
*
)
pgd_quicklist
;
pgd_quicklist
=
(
unsigned
long
*
)
page
;
pgd_cache_size
++
;
preempt_enable
();
...
...
This diff is collapsed.
Click to expand it.
include/asm-x86_64/pci.h
View file @
f2c2b294
...
...
@@ -49,7 +49,7 @@ struct pci_dev;
extern
int
iommu_setup
(
char
*
opt
);
extern
dma_addr_t
bad_dma_address
;
#define pci_dma_error(x) ((x) == bad_dma_address)
#define pci_dma_
mapping_
error(x) ((x) == bad_dma_address)
/* Allocate and map kernel buffer using consistent mode DMA for a device.
* hwdev should be valid struct pci_dev pointer for PCI devices,
...
...
This diff is collapsed.
Click to expand it.
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