10 Oct, 2011
1 commit
-
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (29 commits)
MIPS: Call oops_enter, oops_exit in die
staging/octeon: Software should check the checksum of no tcp/udp packets
MIPS: Octeon: Enable C0_UserLocal probing.
MIPS: No branches in delay slots for huge pages in handle_tlbl
MIPS: Don't clobber CP0_STATUS value for CONFIG_MIPS_MT_SMTC
MIPS: Octeon: Select CONFIG_HOLES_IN_ZONE
MIPS: PM: Use struct syscore_ops instead of sysdevs for PM (v2)
MIPS: Compat: Use 32-bit wrapper for compat_sys_futex.
MIPS: Do not use EXTRA_CFLAGS
MIPS: Alchemy: DB1200: Disable cascade IRQ in handler
SERIAL: Lantiq: Set timeout in uart_port
MIPS: Lantiq: Fix setting the PCI bus speed on AR9
MIPS: Lantiq: Fix external interrupt sources
MIPS: tlbex: Fix build error in R3000 code.
MIPS: Alchemy: Include Au1100 in PM code.
MIPS: Alchemy: Fix typo in MAC0 registration
MIPS: MSP71xx: Fix build error.
MIPS: Handle __put_user() sleeping.
MIPS: Allow forced irq threading
MIPS: i8259: Mark cascade interrupt non-threaded
...
27 Sep, 2011
1 commit
-
Icmp packets with wrong checksum are never dropped since skb->ip_summed is
set to CHECKSUM_UNNECESSARY.When icmp packets with wrong checksum pass through the octeon net driver,
the not_IP, IP_exc, L4_error hardware indicators show no error. so the
driver sets CHECKSUM_UNNECESSARY on skb->ip_summed.L4_error only works for TCP/UDP, not for ICMP.
Signed-off-by: Roy.Li
To: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: ralf@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2798/
Acked-by: David Daney
Cc: Greg KH
21 Sep, 2011
1 commit
-
After commit c5f5c4db3938 ("staging: zcache: fix crash on high memory
swap") cleancache crashes on the first successful get. This was caused
by a remaining virt_to_page() call in zcache_pampd_get_data_and_free()
that only gets run in the cleancache path.The patch converts the virt_to_page() to struct page casting like was
done for other instances in c5f5c4db3938.Signed-off-by: Seth Jennings
Tested-By: Valdis Kletnieks
Acked-by: Dan Magenheimer
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Linus Torvalds
20 Sep, 2011
1 commit
-
Fix build when CONFIG_ISA_DMA_API is enabled but
CONFIG_COMEDI_PCI[_DRIVERS] is not enabled.Fixes these build errors:
drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_ai_cmd':
drivers/staging/comedi/drivers/ni_labpc.c:1351: error: implicit declaration of function 'labpc_suggest_transfer_size'
drivers/staging/comedi/drivers/ni_labpc.c: At top level:
drivers/staging/comedi/drivers/ni_labpc.c:1802: error: conflicting types for 'labpc_suggest_transfer_size'
drivers/staging/comedi/drivers/ni_labpc.c:1351: note: previous implicit declaration of 'labpc_suggest_transfer_size' was hereSigned-off-by: Randy Dunlap
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Linus Torvalds
25 Aug, 2011
1 commit
-
Seen on v3.1-rc3, patch:
omap: mcbsp: Drop in-driver transfer support
bafe2721a0fbd1cc1af04384133684f660f3658eRemoved code that now cause tidspbridge to break while compiling.
Signed-off-by: Omar Ramirez Luna
Signed-off-by: Greg Kroah-Hartman
24 Aug, 2011
5 commits
-
I looks like something used to implicitly include linux/interrupt.h,
and no longer does. Fix the resulting build error by explicitly
including it.Signed-off-by: David Daney
Cc: David S. Miller
Signed-off-by: Greg Kroah-Hartman -
"ret" needs to be signed for the error handling to work properly.
Signed-off-by: Dan Carpenter
Acked-by: Dan Magenheimer
Signed-off-by: Greg Kroah-Hartman -
zcache_put_page() was modified to pass page_address(page) instead of the
actual page structure. In combination with the function signature changes
to tmem_put() and zcache_pampd_create(), zcache_pampd_create() tries to
(re)derive the page structure from the virtual address. However, if the
original page is a high memory page (or any unmapped page), this
virt_to_page() fails because the page_address() in zcache_put_page()
returned NULL.This patch changes zcache_put_page() and zcache_get_page() to pass
the page structure instead of the page's virtual address, which
may or may not exist.Signed-off-by: Seth Jennings
Acked-by: Dan Magenheimer
Signed-off-by: Greg Kroah-Hartman -
Due to missing memset function declaration.
Reviewed-by: Roland Vossen
Signed-off-by: Arend van Spriel
Signed-off-by: Greg Kroah-Hartman -
Since the arrival of kernel version 3.0 in the staging tree it
turns out compile error occurs for sparc64, powerpc, and arm
platforms. This patch fixes that issue.Reviewed-by: Pieter-Paul Giesberts
Reviewed-by: Henry Ptasinski
Signed-off-by: Arend van Spriel
Signed-off-by: Greg Kroah-Hartman
16 Aug, 2011
1 commit
-
Kirill Shutemov found problems with the non-upstream IMG driver where the
use of extra DRM encoder/connector types caused random crashes when the DRM
layer tried to display their matching name. This removes the MIPI types
matching the changes Pauli Nieminen made to the non upstream driver set.As Pauli points out:
" MIPI (or DSI) is protocol specification on top of LVDS serial bus. That
makes it resonable to call MIPI connectors and encoders LVDS."(and indeed they may also be HDMI convertors or similar when we want to
report a more useful to end user result)Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds
09 Aug, 2011
3 commits
-
Signed-off-by: Nitin Gupta
Signed-off-by: Greg Kroah-Hartman -
xv_get_total_size_bytes returns a u64 value and it's used in a division.
This causes build failures in 32-bit architectures, as reported by Randy
Dunlap.Reported-by: Randy Dunlap
Signed-off-by: Thadeu Lima de Souza Cascardo
Cc: Stephen Rothwell
Cc: Dan Magenheimer
Cc: Nitin Gupta
Acked-by: Randy Dunlap
Signed-off-by: Greg Kroah-Hartman -
Using different completion variables to synchronize different kernel threads
This patch fix a bug that may cause memory leak when driver
disconnected. This is not a very urgent bug. Because with the default
setting, driver disconnectting routine won't be called except when Linux
is shut down. But if the option auto_delink_en is set, a small number of
memory would leak out after memory card unplugged.Signed-off-by: wwang
Signed-off-by: Greg Kroah-Hartman
03 Aug, 2011
16 commits
-
Add the missed linux/slab.h to solo6x10.h.
Signed-off-by: Wanlong Gao
Signed-off-by: Greg Kroah-Hartman -
The oncoming cleanup of module.h usage requires the explicit inclusion
of module.h when it was otherwise being included indirectly. Otherwise,
building zcache will fail.Reported-by: Stephen Rothwell
Signed-off-by: Thadeu Lima de Souza Cascardo
Signed-off-by: Greg Kroah-Hartman -
In this code, blkvsc_req is allocated in the cache blkdev->request_pool,
but freed in the first case to the cache blkvsc_req->dev->request_pool.
blkvsc_req->dev is subsequently initialized to blkdev, making these the
same at the second call to kmem_cache_free. But at the point of the first
call, blkvsc_req->dev is NULL. The second call is changed too, for
uniformity.The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)//
@@
expression x,e,e1,e2,e3;
@@x = \(kmem_cache_alloc\|kmem_cache_zalloc\)(e1,e2)
... when != x = e
(
kmem_cache_free(e1,x);
|
?-kmem_cache_free(e3,x);
+kmem_cache_free(e1,x);
)
//Signed-off-by: Julia Lawall
Cc: KY Srinivasan
Cc: Hank Janssen
Cc: Haiyang Zhang
Signed-off-by: Greg Kroah-Hartman -
Add a note about the abuse of the clk API to the nvec/TODO list.
Signed-off-by: Russell King
Signed-off-by: Greg Kroah-Hartman -
Convert array index from the loop bound to the loop index.
A simplified version of the semantic patch that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)//
@@
expression e1,e2,ar;
@@for(e1 = 0; e1 < e2; e1++) { }
//Signed-off-by: Julia Lawall
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
alpha allmodconfig:
drivers/staging/solo6x10/p2m.c:52: error: implicit declaration of function 'kzalloc'
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
alpha allmodconfig:
drivers/staging/solo6x10/core.c:140: error: implicit declaration of function 'kzalloc'
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
alpha allmodconfig:
drivers/staging/dt3155v4l/dt3155v4l.c:434: error: implicit declaration of function 'kzalloc'
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
x86_64 allmodconfig:
In file included from arch/x86/include/asm/uaccess.h:572,
from include/linux/uaccess.h:5,
from drivers/staging/speakup/devsynth.c:4:
In function 'copy_from_user',
inlined from 'speakup_file_write' at drivers/staging/speakup/devsynth.c:28:
arch/x86/include/asm/uaccess_64.h:64: error: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correctI'm not sure what was unprovable about it, but size_t is the correct type
anyway.Also replace needless min_t() with min()
Cc: William Hubbs
Cc: Arjan van de Ven
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This code was cut and pasted in several places. It's missing some
unlocks on error.Signed-off-by: Dan Carpenter
Acked-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman -
Seen during an allmodconfig build for sparc:
CC [M] drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.o
In file included from drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c:26:
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h: In function 'ft1000_read_reg':
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h:80: error: implicit declaration of function 'inw'
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h: In function 'ft1000_write_reg':
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h:86: error: implicit declaration of function 'outw'Signed-off-by: Paul Gortmaker
Signed-off-by: Greg Kroah-Hartman -
declaring MODULE_FIRMWARE has apparently forgotten while removing the embedded
firmware arrays in 0a8692b534e18fcec6eac07551bb37a22659f5c7 (rtl8192u_usb:
Remove built-in firmware images).Signed-off-by: Stefan Lippers-Hollmann
Cc: stable [2.6.39+]
Signed-off-by: Greg Kroah-Hartman -
The private object support has migrated from gma500 into the DRM core,
remove our now clashing copy so -next can build.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
This avoids tainting the kernel as if a proprietary module was loaded.
The kernel will still be tainted because this is a staging driver.Signed-off-by: Thadeu Lima de Souza Cascardo
Signed-off-by: Greg Kroah-Hartman -
zcache is only building tmem.c and not building zcache.c. To keep the
module name, zcache.c must be renamed if symbols from tmem.c are to
remain unexported.Signed-off-by: Thadeu Lima de Souza Cascardo
Acked-by: Dan Magenheimer
Signed-off-by: Greg Kroah-Hartman
30 Jul, 2011
1 commit
-
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
[media] ir-mce_kbd-decoder: include module.h for its facilities
[media] ov5642: include module.h for its facilities
[media] em28xx: Fix DVB-C maxsize for em2884
[media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
[media] v4l: mt9v032: Fix Bayer pattern
[media] V4L: mt9m111: rewrite set_pixfmt
[media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
[media] V4L: initial driver for ov5642 CMOS sensor
[media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
[media] V4L: soc-camera: remove soc-camera bus and devices on it
[media] V4L: soc-camera: un-export the soc-camera bus
[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
[media] V4L: add media bus configuration subdev operations
[media] V4L: soc-camera: group struct field initialisations together
[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
[media] V4L: pxa-camera: switch to using standard PM hooks
[media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
[media] Don't OOPS if videobuf_dvb_get_frontend return NULL
[media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
[media] omap3isp: Support configurable HS/VS polarities
...Fix up conflicts:
- arch/arm/mach-omap2/board-rx51-peripherals.c:
cleanup regulator supply definitions in mach-omap2
vs
OMAP3: RX-51: define vdds_csib regulator supply
- drivers/staging/tm6000/tm6000-alsa.c (trivial)
28 Jul, 2011
9 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (32 commits)
tg3: Remove 5719 jumbo frames and TSO blocks
tg3: Break larger frags into 4k chunks for 5719
tg3: Add tx BD budgeting code
tg3: Consolidate code that calls tg3_tx_set_bd()
tg3: Add partial fragment unmapping code
tg3: Generalize tg3_skb_error_unmap()
tg3: Remove short DMA check for 1st fragment
tg3: Simplify tx bd assignments
tg3: Reintroduce tg3_tx_ring_info
ASIX: Use only 11 bits of header for data size
ASIX: Simplify condition in rx_fixup()
Fix cdc-phonet build
bonding: reduce noise during init
bonding: fix string comparison errors
net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared
net: add IFF_SKB_TX_SHARED flag to priv_flags
net: sock_sendmsg_nosec() is static
forcedeth: fix vlans
gianfar: fix bug caused by 87c288c6e9aa31720b72e2bc2d665e24e1653c3e
gro: Only reset frag0 when skb can be pulled
... -
After the last patch, We are left in a state in which only drivers calling
ether_setup have IFF_TX_SKB_SHARING set (we assume that drivers touching real
hardware call ether_setup for their net_devices and don't hold any state in
their skbs. There are a handful of drivers that violate this assumption of
course, and need to be fixed up. This patch identifies those drivers, and marks
them as not being able to support the safe transmission of skbs by clearning the
IFF_TX_SKB_SHARING flag in priv_flagsSigned-off-by: Neil Horman
CC: Karsten Keil
CC: "David S. Miller"
CC: Jay Vosburgh
CC: Andy Gospodarek
CC: Patrick McHardy
CC: Krzysztof Halasa
CC: "John W. Linville"
CC: Greg Kroah-Hartman
CC: Marcel Holtmann
CC: Johannes Berg
Signed-off-by: David S. Miller -
There were several coding style errors as reported by checkpatch.pl. This
patch should fix those errors with the single exception of the open square
bracket issue on line 45.[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: Adam M. Dutko
Signed-off-by: Mauro Carvalho Chehab -
This was likely used by some test. There's no sense on keeping it
upstream.Signed-off-by: Mauro Carvalho Chehab
-
Update Kconfig description (ddbridge with cxd2099)
Signed-off-by: Oliver Endriss
Signed-off-by: Mauro Carvalho Chehab -
Fix compilation of ngene/ddbridge for DVB_CXD2099=n.
Note: Bug was introduced by commit 'cxd2099: Update to latest version'.
Signed-off-by: Oliver Endriss
Signed-off-by: Mauro Carvalho Chehab -
The CHK_ERROR macro does a flow control, violating chapter 12
of the Documentation/CodingStyle. Doing flow controls inside
macros is a bad idea, as it hides what's happening. It also
hides the var "status" with is also a bad idea.The changes were done by this small perl script:
my $blk=0;
while (<>) {
s/^\s+// if ($blk);
$f =~ s/\s+$// if ($blk && /^\(/);
$blk = 1 if (!m/\#/ && m/CHK_ERROR/);
$blk=0 if ($blk && m/\;/);
s/\n/ / if ($blk);
$f.=$_;
};
$f=~ s,\n(\t+)CHK_ERROR\((.*)\)\;([^\n]*),\n\1status = \2;\3\n\1if (status < 0)\n\1\tbreak;,g;print $f;
And manually fixed.
Signed-off-by: Mauro Carvalho Chehab
-
Codingstyle fixes.
Signed-off-by: Oliver Endriss
Signed-off-by: Mauro Carvalho Chehab -
Import latest driver from ddbridge-0.6.1.tar.bz2.
Signed-off-by: Ralph Metzler
Signed-off-by: Oliver Endriss
Signed-off-by: Mauro Carvalho Chehab
