Skip to content

Commit f38bb7d

Browse files
author
Jiri Kosina
committed
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2 parents 2d4b3f3 + c3b25b3 commit f38bb7d

File tree

780 files changed

+9967
-5818
lines changed

Some content is hidden

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

780 files changed

+9967
-5818
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ series
5252

5353
# cscope files
5454
cscope.*
55+
ncscope.*
5556

5657
*.orig
5758
*~

‎Documentation/ABI/testing/sysfs-class-bdi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ MAJOR:MINOR
1414
non-block filesystems which provide their own BDI, such as NFS
1515
and FUSE.
1616

17+
MAJOR:MINOR-fuseblk
18+
19+
Value of st_dev on fuseblk filesystems.
20+
1721
default
1822

1923
The default backing dev, used for non-block device backed

‎Documentation/DocBook/kernel-locking.tmpl

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,31 @@
703703
</sect1>
704704
</chapter>
705705

706+
<chapter id="trylock-functions">
707+
<title>The trylock Functions</title>
708+
<para>
709+
There are functions that try to acquire a lock only once and immediately
710+
return a value telling about success or failure to acquire the lock.
711+
They can be used if you need no access to the data protected with the lock
712+
when some other thread is holding the lock. You should acquire the lock
713+
later if you then need access to the data protected with the lock.
714+
</para>
715+
716+
<para>
717+
<function>spin_trylock()</function> does not spin but returns non-zero if
718+
it acquires the spinlock on the first try or 0 if not. This function can
719+
be used in all contexts like <function>spin_lock</function>: you must have
720+
disabled the contexts that might interrupt you and acquire the spin lock.
721+
</para>
722+
723+
<para>
724+
<function>mutex_trylock()</function> does not suspend your task
725+
but returns non-zero if it could lock the mutex on the first try
726+
or 0 if not. This function cannot be safely used in hardware or software
727+
interrupt contexts despite not sleeping.
728+
</para>
729+
</chapter>
730+
706731
<chapter id="Examples">
707732
<title>Common Examples</title>
708733
<para>

‎Documentation/cpu-freq/governors.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,6 @@ to its default value of '80' it means that between the checking
129129
intervals the CPU needs to be on average more than 80% in use to then
130130
decide that the CPU frequency needs to be increased.
131131

132-
sampling_down_factor: this parameter controls the rate that the CPU
133-
makes a decision on when to decrease the frequency. When set to its
134-
default value of '5' it means that at 1/5 the sampling_rate the kernel
135-
makes a decision to lower the frequency. Five "lower rate" decisions
136-
have to be made in a row before the CPU frequency is actually lower.
137-
If set to '1' then the frequency decreases as quickly as it increases,
138-
if set to '2' it decreases at half the rate of the increase.
139-
140132
ignore_nice_load: this parameter takes a value of '0' or '1'. When
141133
set to '0' (its default), all processes are counted towards the
142134
'cpu utilisation' value. When set to '1', the processes that are

‎Documentation/hwmon/ibmaem

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
Kernel driver ibmaem
2+
======================
3+
4+
Supported systems:
5+
* Any recent IBM System X server with Active Energy Manager support.
6+
This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
7+
x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface
8+
driver ("ipmi-si") needs to be loaded for this driver to do anything.
9+
Prefix: 'ibmaem'
10+
Datasheet: Not available
11+
12+
Author: Darrick J. Wong
13+
14+
Description
15+
-----------
16+
17+
This driver implements sensor reading support for the energy and power
18+
meters available on various IBM System X hardware through the BMC. All
19+
sensor banks will be exported as platform devices; this driver can talk
20+
to both v1 and v2 interfaces. This driver is completely separate from the
21+
older ibmpex driver.
22+
23+
The v1 AEM interface has a simple set of features to monitor energy use.
24+
There is a register that displays an estimate of raw energy consumption
25+
since the last BMC reset, and a power sensor that returns average power
26+
use over a configurable interval.
27+
28+
The v2 AEM interface is a bit more sophisticated, being able to present
29+
a wider range of energy and power use registers, the power cap as
30+
set by the AEM software, and temperature sensors.
31+
32+
Special Features
33+
----------------
34+
35+
The "power_cap" value displays the current system power cap, as set by
36+
the Active Energy Manager software. Setting the power cap from the host
37+
is not currently supported.

‎Documentation/lguest/lguest.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ struct virtqueue
157157

158158
/* The routine to call when the Guest pings us. */
159159
void (*handle_output)(int fd, struct virtqueue *me);
160+
161+
/* Outstanding buffers */
162+
unsigned int inflight;
160163
};
161164

162165
/* Remember the arguments to the program so we can "reboot" */
@@ -702,6 +705,7 @@ static unsigned get_vq_desc(struct virtqueue *vq,
702705
errx(1, "Looped descriptor");
703706
} while ((i = next_desc(vq, i)) != vq->vring.num);
704707

708+
vq->inflight++;
705709
return head;
706710
}
707711

@@ -719,15 +723,17 @@ static void add_used(struct virtqueue *vq, unsigned int head, int len)
719723
/* Make sure buffer is written before we update index. */
720724
wmb();
721725
vq->vring.used->idx++;
726+
vq->inflight--;
722727
}
723728

724729
/* This actually sends the interrupt for this virtqueue */
725730
static void trigger_irq(int fd, struct virtqueue *vq)
726731
{
727732
unsigned long buf[] = { LHREQ_IRQ, vq->config.irq };
728733

729-
/* If they don't want an interrupt, don't send one. */
730-
if (vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT)
734+
/* If they don't want an interrupt, don't send one, unless empty. */
735+
if ((vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT)
736+
&& vq->inflight)
731737
return;
732738

733739
/* Send the Guest an interrupt tell them we used something up. */
@@ -1107,6 +1113,7 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs,
11071113
vq->next = NULL;
11081114
vq->last_avail_idx = 0;
11091115
vq->dev = dev;
1116+
vq->inflight = 0;
11101117

11111118
/* Initialize the configuration. */
11121119
vq->config.num = num_descs;
@@ -1368,6 +1375,7 @@ static void setup_tun_net(const char *arg)
13681375

13691376
/* Tell Guest what MAC address to use. */
13701377
add_feature(dev, VIRTIO_NET_F_MAC);
1378+
add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
13711379
set_config(dev, sizeof(conf), &conf);
13721380

13731381
/* We don't need the socket any more; setup is done. */

‎MAINTAINERS

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -982,13 +982,6 @@ L: [email protected]
982982
W: http://sourceforge.net/projects/bonding/
983983
S: Supported
984984

985-
BROADBAND PROCESSOR ARCHITECTURE
986-
P: Arnd Bergmann
987-
M: [email protected]
988-
L: [email protected]
989-
W: http://www.penguinppc.org/ppc64/
990-
S: Supported
991-
992985
BROADCOM B44 10/100 ETHERNET DRIVER
993986
P: Gary Zambrano
994987
M: [email protected]
@@ -1052,6 +1045,14 @@ L: [email protected]
10521045
L: [email protected]
10531046
S: Maintained
10541047

1048+
CELL BROADBAND ENGINE ARCHITECTURE
1049+
P: Arnd Bergmann
1050+
M: [email protected]
1051+
L: [email protected]
1052+
L: [email protected]
1053+
W: http://www.ibm.com/developerworks/power/cell/
1054+
S: Supported
1055+
10551056
CFAG12864B LCD DRIVER
10561057
P: Miguel Ojeda Sandonis
10571058
M: [email protected]
@@ -1239,6 +1240,20 @@ L: [email protected]
12391240
W: http://linuxtv.org
12401241
S: Maintained
12411242

1243+
CXGB3 ETHERNET DRIVER (CXGB3)
1244+
P: Divy Le Ray
1245+
M: [email protected]
1246+
L: [email protected]
1247+
W: http://www.chelsio.com
1248+
S: Supported
1249+
1250+
CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
1251+
P: Steve Wise
1252+
M: [email protected]
1253+
L: [email protected]
1254+
W: http://www.openfabrics.org
1255+
S: Supported
1256+
12421257
CYBERPRO FB DRIVER
12431258
P: Russell King
12441259
M: [email protected]
@@ -1645,8 +1660,10 @@ W: http://linux-fbdev.sourceforge.net/
16451660
S: Maintained
16461661

16471662
FREESCALE DMA DRIVER
1648-
P; Zhang Wei
1649-
M: [email protected]
1663+
P: Li Yang
1664+
M: [email protected]
1665+
P: Zhang Wei
1666+
M: [email protected]
16501667
L: [email protected]
16511668
L: [email protected]
16521669
S: Maintained
@@ -3142,7 +3159,7 @@ PCI ERROR RECOVERY
31423159
P: Linas Vepstas
31433160
M: [email protected]
31443161
L: [email protected]
3145-
L: linux-pci@atrey.karlin.mff.cuni.cz
3162+
L: linux-pci@vger.kernel.org
31463163
S: Supported
31473164

31483165
PCI SUBSYSTEM
@@ -3776,6 +3793,14 @@ M: [email protected]
37763793
L: [email protected]
37773794
S: Maintained
37783795

3796+
SPU FILE SYSTEM
3797+
P: Jeremy Kerr
3798+
M: [email protected]
3799+
L: [email protected]
3800+
L: [email protected]
3801+
W: http://www.ibm.com/developerworks/power/cell/
3802+
S: Supported
3803+
37793804
STABLE BRANCH:
37803805
P: Greg Kroah-Hartman
37813806
M: [email protected]
@@ -4350,6 +4375,14 @@ M: [email protected]
43504375
L: [email protected]
43514376
S: Maintained
43524377

4378+
UTIL-LINUX-NG PACKAGE
4379+
P: Karel Zak
4380+
M: [email protected]
4381+
L: [email protected]
4382+
W: http://kernel.org/~kzak/util-linux-ng/
4383+
T: git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
4384+
S: Maintained
4385+
43534386
VFAT/FAT/MSDOS FILESYSTEM:
43544387
P: OGAWA Hirofumi
43554388
M: [email protected]

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 2
22
PATCHLEVEL = 6
33
SUBLEVEL = 26
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc4
55
NAME = Funky Weasel is Jiggy wit it
66

77
# *DOCUMENTATION*

‎arch/arm/mach-at91/at91x40.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,32 @@
1616
#include <asm/mach/arch.h>
1717
#include <asm/arch/at91x40.h>
1818
#include <asm/arch/at91_st.h>
19+
#include <asm/arch/timex.h>
1920
#include "generic.h"
2021

2122
/*
22-
* This is used in the gpio code, stub locally.
23+
* Export the clock functions for the AT91X40. Some external code common
24+
* to all AT91 family parts relys on this, like the gpio and serial support.
2325
*/
2426
int clk_enable(struct clk *clk)
2527
{
2628
return 0;
2729
}
2830

31+
void clk_disable(struct clk *clk)
32+
{
33+
}
34+
35+
unsigned long clk_get_rate(struct clk *clk)
36+
{
37+
return AT91X40_MASTER_CLOCK;
38+
}
39+
40+
struct clk *clk_get(struct device *dev, const char *id)
41+
{
42+
return NULL;
43+
}
44+
2945
void __init at91x40_initialize(unsigned long main_clock)
3046
{
3147
at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1)

‎arch/arm/mach-integrator/impd1.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,8 @@ static int impd1_probe(struct lm_device *dev)
369369

370370
lm_set_drvdata(dev, impd1);
371371

372-
printk("IM-PD1 found at 0x%08lx\n", dev->resource.start);
372+
printk("IM-PD1 found at 0x%08lx\n",
373+
(unsigned long)dev->resource.start);
373374

374375
for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) {
375376
impd1->vcos[i].owner = THIS_MODULE,

‎arch/arm/mach-integrator/pci_v3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,6 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
405405
addr, fsr, pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255,
406406
v3_readb(V3_LB_ISTAT));
407407
printk(KERN_DEBUG "%s", buf);
408-
printascii(buf);
409408
#endif
410409

411410
v3_writeb(V3_LB_ISTAT, 0);
@@ -447,6 +446,7 @@ static irqreturn_t v3_irq(int dummy, void *devid)
447446
unsigned long pc = instruction_pointer(regs);
448447
unsigned long instr = *(unsigned long *)pc;
449448
char buf[128];
449+
extern void printascii(const char *);
450450

451451
sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x "
452452
"ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr,

‎arch/arm/mach-omap1/board-palmte.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <linux/mtd/mtd.h>
2525
#include <linux/mtd/partitions.h>
2626
#include <linux/spi/spi.h>
27-
#include <linux/spi/tsc2102.h>
2827
#include <linux/interrupt.h>
2928
#include <linux/apm-emulation.h>
3029

@@ -315,14 +314,6 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery)
315314
#define palmte_get_power_status NULL
316315
#endif
317316

318-
static struct tsc2102_config palmte_tsc2102_config = {
319-
.use_internal = 0,
320-
.monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP,
321-
.temp_at25c = { 2200, 2615 },
322-
.apm_report = palmte_get_power_status,
323-
.alsa_config = &palmte_alsa_config,
324-
};
325-
326317
static struct omap_board_config_kernel palmte_config[] __initdata = {
327318
{ OMAP_TAG_USB, &palmte_usb_config },
328319
{ OMAP_TAG_MMC, &palmte_mmc_config },
@@ -336,7 +327,6 @@ static struct spi_board_info palmte_spi_info[] __initdata = {
336327
.bus_num = 2, /* uWire (officially) */
337328
.chip_select = 0, /* As opposed to 3 */
338329
.irq = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO),
339-
.platform_data = &palmte_tsc2102_config,
340330
.max_speed_hz = 8000000,
341331
},
342332
};

‎arch/arm/mach-pxa/spitz.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include <asm/arch/pxa-regs.h>
3939
#include <asm/arch/pxa2xx-regs.h>
4040
#include <asm/arch/pxa2xx-gpio.h>
41-
#include <asm/arch/pxa27x-udc.h>
4241
#include <asm/arch/irda.h>
4342
#include <asm/arch/mmc.h>
4443
#include <asm/arch/ohci.h>

‎arch/arm/mach-s3c2410/mach-bast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static struct resource bast_dm9k_resource[] = {
374374
[2] = {
375375
.start = IRQ_DM9000,
376376
.end = IRQ_DM9000,
377-
.flags = IORESOURCE_IRQ,
377+
.flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH,
378378
}
379379

380380
};

‎arch/arm/mach-s3c2410/mach-vr1000.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static struct resource vr1000_dm9k0_resource[] = {
263263
[2] = {
264264
.start = IRQ_VR1000_DM9000A,
265265
.end = IRQ_VR1000_DM9000A,
266-
.flags = IORESOURCE_IRQ
266+
.flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH,
267267
}
268268

269269
};
@@ -282,7 +282,7 @@ static struct resource vr1000_dm9k1_resource[] = {
282282
[2] = {
283283
.start = IRQ_VR1000_DM9000N,
284284
.end = IRQ_VR1000_DM9000N,
285-
.flags = IORESOURCE_IRQ
285+
.flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH,
286286
}
287287
};
288288

0 commit comments

Comments
 (0)