Skip to content

Commit b855192

Browse files
author
H. Peter Anvin
committed
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent Resolved semantic conflicts in: arch/x86/mm/pat.c arch/x86/mm/ioremap.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2 parents d886c73 + 3e0e1e9 commit b855192

File tree

1,990 files changed

+49352
-28027
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,990 files changed

+49352
-28027
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*.gz
2828
*.lzma
2929
*.patch
30+
*.gcno
3031

3132
#
3233
# Top-level generic files

‎CREDITS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
18561856
D: The Linux Support Team Erlangen
18571857

18581858
N: Andreas Koensgen
1859-
E: ajk@iehk.rwth-aachen.de
1859+
E: ajk@comnets.uni-bremen.de
18601860
D: 6pack driver for AX.25
18611861

18621862
N: Harald Koerfgen
@@ -2006,6 +2006,9 @@ E: paul@laufernet.com
20062006
D: Soundblaster driver fixes, ISAPnP quirk
20072007
S: California, USA
20082008

2009+
N: Jonathan Layes
2010+
D: ARPD support
2011+
20092012
N: Tom Lees
20102013
E: tom@lpsg.demon.co.uk
20112014
W: http://www.lpsg.demon.co.uk/
@@ -3802,6 +3805,9 @@ S: van Bronckhorststraat 12
38023805
S: 2612 XV Delft
38033806
S: The Netherlands
38043807

3808+
N: Thomas Woller
3809+
D: CS461x Cirrus Logic sound driver
3810+
38053811
N: David Woodhouse
38063812
E: dwmw2@infradead.org
38073813
D: JFFS2 file system, Memory Technology Device subsystem,

‎Documentation/ABI/testing/sysfs-block

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,28 +94,37 @@ What: /sys/block/<disk>/queue/physical_block_size
9494
Date: May 2009
9595
Contact: Martin K. Petersen <martin.petersen@oracle.com>
9696
Description:
97-
This is the smallest unit the storage device can write
98-
without resorting to read-modify-write operation. It is
99-
usually the same as the logical block size but may be
100-
bigger. One example is SATA drives with 4KB sectors
101-
that expose a 512-byte logical block size to the
102-
operating system.
97+
This is the smallest unit a physical storage device can
98+
write atomically. It is usually the same as the logical
99+
block size but may be bigger. One example is SATA
100+
drives with 4KB sectors that expose a 512-byte logical
101+
block size to the operating system. For stacked block
102+
devices the physical_block_size variable contains the
103+
maximum physical_block_size of the component devices.
103104

104105
What: /sys/block/<disk>/queue/minimum_io_size
105106
Date: April 2009
106107
Contact: Martin K. Petersen <martin.petersen@oracle.com>
107108
Description:
108-
Storage devices may report a preferred minimum I/O size,
109-
which is the smallest request the device can perform
110-
without incurring a read-modify-write penalty. For disk
111-
drives this is often the physical block size. For RAID
112-
arrays it is often the stripe chunk size.
109+
Storage devices may report a granularity or preferred
110+
minimum I/O size which is the smallest request the
111+
device can perform without incurring a performance
112+
penalty. For disk drives this is often the physical
113+
block size. For RAID arrays it is often the stripe
114+
chunk size. A properly aligned multiple of
115+
minimum_io_size is the preferred request size for
116+
workloads where a high number of I/O operations is
117+
desired.
113118

114119
What: /sys/block/<disk>/queue/optimal_io_size
115120
Date: April 2009
116121
Contact: Martin K. Petersen <martin.petersen@oracle.com>
117122
Description:
118123
Storage devices may report an optimal I/O size, which is
119-
the device's preferred unit of receiving I/O. This is
120-
rarely reported for disk drives. For RAID devices it is
121-
usually the stripe width or the internal block size.
124+
the device's preferred unit for sustained I/O. This is
125+
rarely reported for disk drives. For RAID arrays it is
126+
usually the stripe width or the internal track size. A
127+
properly aligned multiple of optimal_io_size is the
128+
preferred request size for workloads where sustained
129+
throughput is desired. If no optimal I/O size is
130+
reported this file contains 0.

‎Documentation/DocBook/kernel-hacking.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ printk(KERN_INFO "i = %u\n", i);
449449
</para>
450450

451451
<programlisting>
452-
__u32 ipaddress;
453-
printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress));
452+
__be32 ipaddress;
453+
printk(KERN_INFO "my ip: %pI4\n", &amp;ipaddress);
454454
</programlisting>
455455

456456
<para>

‎Documentation/DocBook/mac80211.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ usage should require reading the full document.
184184
!Finclude/net/mac80211.h ieee80211_ctstoself_get
185185
!Finclude/net/mac80211.h ieee80211_ctstoself_duration
186186
!Finclude/net/mac80211.h ieee80211_generic_frame_duration
187-
!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb
188-
!Finclude/net/mac80211.h ieee80211_hdrlen
189187
!Finclude/net/mac80211.h ieee80211_wake_queue
190188
!Finclude/net/mac80211.h ieee80211_stop_queue
191189
!Finclude/net/mac80211.h ieee80211_wake_queues

‎Documentation/RCU/rculist_nulls.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ not detect it missed following items in original chain.
8383
obj = kmem_cache_alloc(...);
8484
lock_chain(); // typically a spin_lock()
8585
obj->key = key;
86-
atomic_inc(&obj->refcnt);
8786
/*
8887
* we need to make sure obj->key is updated before obj->next
88+
* or obj->refcnt
8989
*/
9090
smp_wmb();
91+
atomic_set(&obj->refcnt, 1);
9192
hlist_add_head_rcu(&obj->obj_node, list);
9293
unlock_chain(); // typically a spin_unlock()
9394

@@ -159,6 +160,10 @@ out:
159160
obj = kmem_cache_alloc(cachep);
160161
lock_chain(); // typically a spin_lock()
161162
obj->key = key;
163+
/*
164+
* changes to obj->key must be visible before refcnt one
165+
*/
166+
smp_wmb();
162167
atomic_set(&obj->refcnt, 1);
163168
/*
164169
* insert obj in RCU way (readers might be traversing chain)

‎Documentation/arm/memory.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ ffff8000 ffffffff copy_user_page / clear_user_page use.
2121
For SA11xx and Xscale, this is used to
2222
setup a minicache mapping.
2323

24+
ffff4000 ffffffff cache aliasing on ARMv6 and later CPUs.
25+
2426
ffff1000 ffff7fff Reserved.
2527
Platforms must not use this address range.
2628

‎Documentation/connector/cn_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* cn_test.c
33
*
4-
* 2004-2005 Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru>
4+
* 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
55
* All rights reserved.
66
*
77
* This program is free software; you can redistribute it and/or modify
@@ -194,5 +194,5 @@ module_init(cn_test_init);
194194
module_exit(cn_test_fini);
195195

196196
MODULE_LICENSE("GPL");
197-
MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
197+
MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
198198
MODULE_DESCRIPTION("Connector's test module");

‎Documentation/connector/ucon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ucon.c
33
*
4-
* Copyright (c) 2004+ Evgeniy Polyakov <johnpol@2ka.mipt.ru>
4+
* Copyright (c) 2004+ Evgeniy Polyakov <zbr@ioremap.net>
55
*
66
*
77
* This program is free software; you can redistribute it and/or modify

‎Documentation/driver-model/driver.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ Attributes
207207
~~~~~~~~~~
208208
struct driver_attribute {
209209
struct attribute attr;
210-
ssize_t (*show)(struct device_driver *, char * buf, size_t count, loff_t off);
211-
ssize_t (*store)(struct device_driver *, const char * buf, size_t count, loff_t off);
210+
ssize_t (*show)(struct device_driver *driver, char *buf);
211+
ssize_t (*store)(struct device_driver *, const char * buf, size_t count);
212212
};
213213

214214
Device drivers can export attributes via their sysfs directories.

‎Documentation/dvb/get_dvb_firmware

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use IO::Handle;
2525
"tda10046lifeview", "av7110", "dec2000t", "dec2540t",
2626
"dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
2727
"or51211", "or51132_qam", "or51132_vsb", "bluebird",
28-
"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2" );
28+
"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718" );
2929

3030
# Check args
3131
syntax() if (scalar(@ARGV) != 1);
@@ -381,6 +381,57 @@ sub cx18 {
381381
$allfiles;
382382
}
383383

384+
sub mpc718 {
385+
my $archive = 'Yuan MPC718 TV Tuner Card 2.13.10.1016.zip';
386+
my $url = "ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/$archive";
387+
my $fwfile = "dvb-cx18-mpc718-mt352.fw";
388+
my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
389+
390+
checkstandard();
391+
wgetfile($archive, $url);
392+
unzip($archive, $tmpdir);
393+
394+
my $sourcefile = "$tmpdir/Yuan MPC718 TV Tuner Card 2.13.10.1016/mpc718_32bit/yuanrap.sys";
395+
my $found = 0;
396+
397+
open IN, '<', $sourcefile or die "Couldn't open $sourcefile to extract $fwfile data\n";
398+
binmode IN;
399+
open OUT, '>', $fwfile;
400+
binmode OUT;
401+
{
402+
# Block scope because we change the line terminator variable $/
403+
my $prevlen = 0;
404+
my $currlen;
405+
406+
# Buried in the data segment are 3 runs of almost identical
407+
# register-value pairs that end in 0x5d 0x01 which is a "TUNER GO"
408+
# command for the MT352.
409+
# Pull out the middle run (because it's easy) of register-value
410+
# pairs to make the "firmware" file.
411+
412+
local $/ = "\x5d\x01"; # MT352 "TUNER GO"
413+
414+
while (<IN>) {
415+
$currlen = length($_);
416+
if ($prevlen == $currlen && $currlen <= 64) {
417+
chop; chop; # Get rid of "TUNER GO"
418+
s/^\0\0//; # get rid of leading 00 00 if it's there
419+
printf OUT "$_";
420+
$found = 1;
421+
last;
422+
}
423+
$prevlen = $currlen;
424+
}
425+
}
426+
close OUT;
427+
close IN;
428+
if (!$found) {
429+
unlink $fwfile;
430+
die "Couldn't find valid register-value sequence in $sourcefile for $fwfile\n";
431+
}
432+
$fwfile;
433+
}
434+
384435
sub cx23885 {
385436
my $url = "http://linuxtv.org/downloads/firmware/";
386437

‎Documentation/feature-removal-schedule.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,3 +458,13 @@ Why: Remove the old legacy 32bit machine check code. This has been
458458
but the old version has been kept around for easier testing. Note this
459459
doesn't impact the old P5 and WinChip machine check handlers.
460460
Who: Andi Kleen <andi@firstfloor.org>
461+
462+
----------------------------
463+
464+
What: lock_policy_rwsem_* and unlock_policy_rwsem_* will not be
465+
exported interface anymore.
466+
When: 2.6.33
467+
Why: cpu_policy_rwsem has a new cleaner definition making it local to
468+
cpufreq core and contained inside cpufreq.c. Other dependent
469+
drivers should not use it in order to safely avoid lockdep issues.
470+
Who: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>

‎Documentation/filesystems/sysfs.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ interface.
2323
Using sysfs
2424
~~~~~~~~~~~
2525

26-
sysfs is always compiled in. You can access it by doing:
26+
sysfs is always compiled in if CONFIG_SYSFS is defined. You can access
27+
it by doing:
2728

2829
mount -t sysfs sysfs /sys
2930

‎Documentation/ioctl/ioctl-number.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ Code Seq# Include File Comments
139139
'm' all linux/synclink.h conflict!
140140
'm' 00-1F net/irda/irmod.h conflict!
141141
'n' 00-7F linux/ncp_fs.h
142+
'n' 80-8F linux/nilfs2_fs.h NILFS2
142143
'n' E0-FF video/matrox.h matroxfb
143144
'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2
144145
'o' 00-03 include/mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps)

‎Documentation/kernel-parameters.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,6 +1115,10 @@ and is between 256 and 4096 characters. It is defined in the file
11151115
libata.dma=4 Compact Flash DMA only
11161116
Combinations also work, so libata.dma=3 enables DMA
11171117
for disks and CDROMs, but not CFs.
1118+
1119+
libata.ignore_hpa= [LIBATA] Ignore HPA limit
1120+
libata.ignore_hpa=0 keep BIOS limits (default)
1121+
libata.ignore_hpa=1 ignore limits, using full disk
11181122

11191123
libata.noacpi [LIBATA] Disables use of ACPI in libata suspend/resume
11201124
when set.
@@ -1720,8 +1724,8 @@ and is between 256 and 4096 characters. It is defined in the file
17201724
oprofile.cpu_type= Force an oprofile cpu type
17211725
This might be useful if you have an older oprofile
17221726
userland or if you want common events.
1723-
Format: { archperfmon }
1724-
archperfmon: [X86] Force use of architectural
1727+
Format: { arch_perfmon }
1728+
arch_perfmon: [X86] Force use of architectural
17251729
perfmon on Intel CPUs instead of the
17261730
CPU specific event set.
17271731

0 commit comments

Comments
 (0)