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
c134be28
Commit
c134be28
authored
Dec 07, 2003
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Plain Diff
Merge redhat.com:/spare/repo/linux-2.5
into redhat.com:/spare/repo/net-drivers-2.5
parents
5d568a16
8255b244
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
10 deletions
+16
-10
drivers/i2c/busses/i2c-nforce2.c
drivers/i2c/busses/i2c-nforce2.c
+1
-1
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+1
-2
include/asm-x86_64/msr.h
include/asm-x86_64/msr.h
+3
-3
mm/mmap.c
mm/mmap.c
+8
-2
net/bridge/br_netfilter.c
net/bridge/br_netfilter.c
+1
-1
net/ipv4/netfilter/ip_conntrack_standalone.c
net/ipv4/netfilter/ip_conntrack_standalone.c
+2
-1
No files found.
drivers/i2c/busses/i2c-nforce2.c
View file @
c134be28
...
...
@@ -147,7 +147,7 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
case
I2C_SMBUS_BYTE
:
if
(
read_write
==
I2C_SMBUS_WRITE
)
outb_p
(
data
->
byte
,
NVIDIA_SMB_DATA
);
outb_p
(
command
,
NVIDIA_SMB_CMD
);
protocol
|=
NVIDIA_SMB_PRTCL_BYTE
;
break
;
...
...
drivers/scsi/libata-core.c
View file @
c134be28
...
...
@@ -3224,8 +3224,6 @@ void ata_pci_remove_one (struct pci_dev *pdev)
scsi_host_put
(
ap
->
host
);
/* FIXME: check return val */
}
kfree
(
host_set
);
pci_release_regions
(
pdev
);
for
(
i
=
0
;
i
<
host_set
->
n_ports
;
i
++
)
{
...
...
@@ -3242,6 +3240,7 @@ void ata_pci_remove_one (struct pci_dev *pdev)
}
}
kfree
(
host_set
);
pci_disable_device
(
pdev
);
pci_set_drvdata
(
pdev
,
NULL
);
}
...
...
include/asm-x86_64/msr.h
View file @
c134be28
...
...
@@ -50,9 +50,9 @@
__asm__ __volatile__ ("rdtsc" : "=a" (low) : : "edx")
#define rdtscll(val) do { \
unsigned int
a,
d; \
asm volatile("rdtsc" : "=a" (
a), "=d" (
d)); \
(val) = ((unsigned long)
a) | (((unsigned long)
d)<<32); \
unsigned int
__a,__
d; \
asm volatile("rdtsc" : "=a" (
__a), "=d" (__
d)); \
(val) = ((unsigned long)
__a) | (((unsigned long)__
d)<<32); \
} while(0)
#define rdpmc(counter,low,high) \
...
...
mm/mmap.c
View file @
c134be28
...
...
@@ -19,6 +19,7 @@
#include <linux/hugetlb.h>
#include <linux/profile.h>
#include <linux/module.h>
#include <linux/mount.h>
#include <asm/uaccess.h>
#include <asm/pgalloc.h>
...
...
@@ -474,9 +475,14 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
struct
rb_node
**
rb_link
,
*
rb_parent
;
unsigned
long
charged
=
0
;
if
(
file
&&
(
!
file
->
f_op
||
!
file
->
f_op
->
mmap
))
if
(
file
)
{
if
(
!
file
->
f_op
||
!
file
->
f_op
->
mmap
)
return
-
ENODEV
;
if
((
prot
&
PROT_EXEC
)
&&
(
file
->
f_vfsmnt
->
mnt_flags
&
MNT_NOEXEC
))
return
-
EPERM
;
}
if
(
!
len
)
return
addr
;
...
...
net/bridge/br_netfilter.c
View file @
c134be28
...
...
@@ -180,7 +180,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
struct
rtable
*
rt
;
struct
flowi
fl
=
{
.
nl_u
=
{
.
ip4_u
=
{
.
daddr
=
iph
->
daddr
,
.
saddr
=
0
,
.
tos
=
iph
->
tos
}
},
.
proto
=
0
};
.
tos
=
RT_TOS
(
iph
->
tos
)
}
},
.
proto
=
0
};
if
(
!
ip_route_output_key
(
&
rt
,
&
fl
))
{
/* Bridged-and-DNAT'ed traffic doesn't
...
...
net/ipv4/netfilter/ip_conntrack_standalone.c
View file @
c134be28
...
...
@@ -201,7 +201,8 @@ static unsigned int ip_refrag(unsigned int hooknum,
/* Local packets are never produced too large for their
interface. We degfragment them at LOCAL_OUT, however,
so we have to refragment them here. */
if
((
*
pskb
)
->
len
>
dst_pmtu
(
&
rt
->
u
.
dst
))
{
if
((
*
pskb
)
->
len
>
dst_pmtu
(
&
rt
->
u
.
dst
)
&&
!
skb_shinfo
(
*
pskb
)
->
tso_size
)
{
/* No hook can be after us, so this should be OK. */
ip_fragment
(
*
pskb
,
okfn
);
return
NF_STOLEN
;
...
...
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