Re: [PATCH] binfmt_script: do not leave interp on stack
Kees Cook wrote:
> On Thu, Oct 11, 2012 at 07:32:40PM -0700, Kees Cook wrote:
>> +/*
>> + * Since bprm is already modified, we cannot continue if the the
>> + * handlers for starting the new interpreter have failed.
>> + * Make sure that we do not return -ENOEXEC, as that would
>> + * allow searching for handlers to continue.
>> + */
>> +if (retval == -ENOEXEC)
>> +retval = -EINVAL;
>
> After looking at this some more, I wonder if this should be -ELOOP
> instead? Or maybe that should happen if/when the recursion depth problem is
> fixed?
>
> This is much more obvious, instead of "Invalid argument":
> $ ./dotest.sh
> file-AAAfile-:
> bad interpreter: Too many levels of symbolic links
In my opinion, a different, more specific error code is nice, but when
not self-explanatory, it would need to be documented to avoid confusion.
I do not know, what would be the most accepted way to change syscall
return value semantics, if to change semantics or add new ones. From
man-pages, many have already some meaning and only some could be
re-interpreted in that way:
E2BIG: The total number of bytes in the environment (envp) and argument
list (argv) is too large. (not perfect, because usually only associated
with mem/file size issues)
ELOOP: Too many symbolic links were encountered in resolving filename
or the name of a script or ELF interpreter. (currently no distinction
from real symlink problems)
EMFILE: The process has the maximum number of files open. (too generic?)
This one has already a meaning, but only for ELF not script (but since
script might also call ELF in the end, user cannot know):
EINVAL: An ELF executable had more than one PT_INTERP segment (i.e.,
tried to name more than one interpreter).
Those are not yet unused, but I think it is a bad idea to add them,
since some programs might be confused by unexpected error code:
ELIBMAX: Attempting to link in too many shared libraries (not a really
good match)
EMLINK: Too many links (somehow generic, do not know if usually used
another way).
It is strange: from current description, this one suits best, the only
reason why we want to get rid of it is, that it triggers module
reloading and another round of execution.
ENOEXEC: An executable is not in a recognized format, is for the wrong
architecture, or has some other format error that means it cannot be
executed.
Perhaps it would be better to continue returning ENOEXEC from syscall in
that case but change the logic for module-reloading (use some other
return value meaning in binfmt handlers in kernel internally)?
> More importantly, I also wonder if interp handling to just be
> changed to be an allocation that needs to be cleaned up, as done with
> argv?
You mean like an allocation on the stack of the new process' growing
stack? This would be cleaned automatically if something goes wrong
during exec.
> Right now interp just points to the filename argument handed to
> do_execve. Especially since it looks like binfmt_misc is vulnerable
> to this as well, since it runs the risk of getting -ENOEXEC from
> search_binary_handler, leaving bprm->interp pointing into the stack,
> only to get it recalled after module loading attempts:
>
> static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
> {
> ...
> char iname[BINPRM_BUF_SIZE];
> ...
> bprm->interp = iname; /* for binfmt_script */
> ...
> retval = search_binary_handler (bprm, regs);
> if (retval < 0)
> goto _error;
> ...
> _ret:
> return retval;
> _error:
> if (fd_binary > 0)
> sys_close(fd_binary);
> bprm->interp_flags = 0;
> bprm->interp_data = 0;
> goto _ret;
> }
Correct. I hope the patch should be a formality, as soon as discussion
on this one is done.
--
http://www.halfdog.net/
PGP: 156A AE98 B91F 0114 FE88 2BD8 C459 9386 feed a bee
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH] genirq: for edge interrupt IRQS_ONESHOT support with irq thread
On Fri, 2012-10-12 at 22:52 +0200, Thomas Gleixner wrote: > On Fri, 12 Oct 2012, Liu, Chuansheng wrote: > > > -Original Message- > > > From: anish kumar [mailto:anish198519851...@gmail.com] > > > Sent: Friday, October 12, 2012 11:25 PM > > > To: Liu, Chuansheng > > > Cc: Thomas Gleixner; linux-kernel@vger.kernel.org > > > Subject: RE: [PATCH] genirq: for edge interrupt IRQS_ONESHOT support with > > > irq > > > thread > > > > > > On Fri, 2012-10-12 at 14:57 +, Liu, Chuansheng wrote: > > > > > On SMP an interrupt which is raised after the ack() again before the > > > > > handler finishes, can invoke another delivery on a different CPU, > > > > > which then sees the IRQ_INPROGESS flag, masks it and flags it > > > > > PENDING. When the primary handler on the first CPU returns, it sees > > > > > the PENDING flag, unmasks and invokes the handler another time. > > > > In this case, when IRQ_INPROGRESS flag is set, on another CPU, it will > > > > mask and ack it, if before the primary handler on the first CPU returns, > > > > the edge interrupt is raised again, it will be lost, right? > > > Why will the interrupt be raised again?Is not it masked?I read tglx > > I means because it is masked, if at this time device issues edge irq, > > It will not be delivered and lost. > > No, it is NOT lost. The irq is marked PENDING already, so we invoke It is fairly easy for an edge triggered interrupt to be missed - for example if interrupts have to be masked for a period - and unless there is some type of hardware latch that records the event it is impossible to recover. tglx, explanation will only work if we have a hardware latch which when unmasked sends all those edge interrupts again (which had come when it was masked while the CPU was handling the same interrupts). PS:http://kernel.org/doc/htmldocs/genericirq.html > the handler again and handle it. And before we invoke the handler > another time we unmask it. > > It does not matter at all whether the interrupt has been sent five > times while it was masked. What matters is that we recorded the first > one and set the PENDING flag. That way we invoke the interrupt handler > again and keep stuff rolling. > > Thanks, > > tglx -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] user namespace compile fixes for 3.7
Linus,
Please pull the for-linus git tree from:
git://git.kernel.org:/pub/scm/linux/kernel/git/ebiederm/user-namespace.git
for-linus
HEAD: e9069f470803eeb5e243a05bc717452c6218bd71 btrfs: Fix compilation with
user namespace support enabled
This tree contains three trivial fixes. One compiler warning, one thinko
fix, and one build fix.
Eric W. Biederman (3):
userns: Properly print bluetooth socket uids
userns: Fix posix_acl_file_xattr_userns gid conversion
btrfs: Fix compilation with user namespace support enabled
fs/btrfs/tree-log.c |4 ++--
fs/xattr_acl.c |2 +-
net/bluetooth/af_bluetooth.c |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index e9ebb47..81e407d 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2952,8 +2952,8 @@ static void fill_inode_item(struct btrfs_trans_handle
*trans,
struct btrfs_inode_item *item,
struct inode *inode, int log_inode_only)
{
- btrfs_set_inode_uid(leaf, item, inode->i_uid);
- btrfs_set_inode_gid(leaf, item, inode->i_gid);
+ btrfs_set_inode_uid(leaf, item, i_uid_read(inode));
+ btrfs_set_inode_gid(leaf, item, i_gid_read(inode));
btrfs_set_inode_mode(leaf, item, inode->i_mode);
btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
index 11efd83..9fbea87 100644
--- a/fs/xattr_acl.c
+++ b/fs/xattr_acl.c
@@ -45,7 +45,7 @@ static void posix_acl_fix_xattr_userns(
break;
case ACL_GROUP:
gid = make_kgid(from, le32_to_cpu(entry->e_id));
- entry->e_id = cpu_to_le32(from_kuid(to, uid));
+ entry->e_id = cpu_to_le32(from_kgid(to, gid));
break;
default:
break;
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 9d49ee6..ba033f0 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -591,7 +591,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)
atomic_read(>sk_refcnt),
sk_rmem_alloc_get(sk),
sk_wmem_alloc_get(sk),
- sock_i_uid(sk),
+ from_kuid(seq_user_ns(seq), sock_i_uid(sk)),
sock_i_ino(sk),
_baswapped,
_baswapped,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] mtd: gpmi: remove unneccessary header
The whole gpmi-nand driver has turned to pure devicetree supported.
So the linux/mtd/gpmi-nand.h is not neccessary now. Just remove it,
and move some macros to the gpmi-nand driver itself.
Signed-off-by: Huang Shijie
---
drivers/mtd/nand/gpmi-nand/gpmi-lib.c |1 -
drivers/mtd/nand/gpmi-nand/gpmi-nand.c |7 +++-
drivers/mtd/nand/gpmi-nand/gpmi-nand.h |1 -
include/linux/mtd/gpmi-nand.h | 68
4 files changed, 6 insertions(+), 71 deletions(-)
delete mode 100644 include/linux/mtd/gpmi-nand.h
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index 3502acc..1585c5b 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -18,7 +18,6 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include
#include
#include
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index e2c56fc..d376198 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -33,6 +32,12 @@
#include
#include "gpmi-nand.h"
+/* Resource names for the GPMI NAND driver. */
+#define GPMI_NAND_GPMI_REGS_ADDR_RES_NAME "gpmi-nand"
+#define GPMI_NAND_BCH_REGS_ADDR_RES_NAME "bch"
+#define GPMI_NAND_BCH_INTERRUPT_RES_NAME "bch"
+#define GPMI_NAND_DMA_INTERRUPT_RES_NAME "gpmi-dma"
+
/* add our owner bbt descriptor */
static uint8_t scan_ff_pattern[] = { 0xff };
static struct nand_bbt_descr gpmi_bbt_descr = {
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
index 7ac25c1..3d93a5e 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
@@ -130,7 +130,6 @@ struct gpmi_nand_data {
/* System Interface */
struct device *dev;
struct platform_device *pdev;
- struct gpmi_nand_platform_data *pdata;
/* Resources */
struct resourcesresources;
diff --git a/include/linux/mtd/gpmi-nand.h b/include/linux/mtd/gpmi-nand.h
deleted file mode 100644
index ed3c4e0..000
--- a/include/linux/mtd/gpmi-nand.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __MACH_MXS_GPMI_NAND_H__
-#define __MACH_MXS_GPMI_NAND_H__
-
-/* The size of the resources is fixed. */
-#define GPMI_NAND_RES_SIZE 6
-
-/* Resource names for the GPMI NAND driver. */
-#define GPMI_NAND_GPMI_REGS_ADDR_RES_NAME "gpmi-nand"
-#define GPMI_NAND_GPMI_INTERRUPT_RES_NAME "GPMI NAND GPMI Interrupt"
-#define GPMI_NAND_BCH_REGS_ADDR_RES_NAME "bch"
-#define GPMI_NAND_BCH_INTERRUPT_RES_NAME "bch"
-#define GPMI_NAND_DMA_CHANNELS_RES_NAME"GPMI NAND DMA Channels"
-#define GPMI_NAND_DMA_INTERRUPT_RES_NAME "gpmi-dma"
-
-/**
- * struct gpmi_nand_platform_data - GPMI NAND driver platform data.
- *
- * This structure communicates platform-specific information to the GPMI NAND
- * driver that can't be expressed as resources.
- *
- * @platform_init: A pointer to a function the driver will call to
- * initialize the platform (e.g., set up the pin
mux).
- * @min_prop_delay_in_ns:Minimum propagation delay of GPMI signals to and
- * from the NAND Flash device, in nanoseconds.
- * @max_prop_delay_in_ns:Maximum propagation delay of GPMI signals to and
- * from the NAND Flash device, in nanoseconds.
- * @max_chip_count: The maximum number of chips for which the driver
- * should configure the hardware. This value most
- * likely reflects the number of pins that are
- * connected to a NAND Flash device. If this is
- * greater than the SoC hardware can support, the
- * driver will print a message and fail to
initialize.
- * @partitions: An optional pointer to an array of partition
- *
Re: Seems like "sched: Add missing call to calc_load_exit_idle()" should be reverted in 3.5 branch
So I still think that "sched: Add missing call to calc_load_exit_idle()" should be reverted in 3.5 branch... > On 10/06/2012 01:23 AM, Peter Zijlstra wrote: >> On Fri, 2012-10-05 at 10:10 -0700, Jonathan Nieder wrote: >>> Peter Zijlstra wrote: On Thu, 2012-10-04 at 15:27 -0700, Greg Kroah-Hartman wrote: >>> > I'm puzzled as well. Any ideas if I should do anything here or not? So I think the current v3.5.5 code is fine. >>> >>> Now I'm puzzled. You wrote: >>> >>> | However, since we don't restart the tick, we won't be sampling load >>> muck >>> | and calling calc_load_exit_idle() from there is bound to confuse >>> state. >>> >>> Doesn't that mean 900404e5d201 "sched: Add missing call to >>> calc_load_exit_idle()" which is part of 3.5.5 was problematic? Or >>> did I just miscount the number of "not"s? >> >> >> Argh, yeah, so now I've managed to confuse everyone I'm afraid. >> >> You are right, v3.5.5 has one calc_load_exit_idle() too many, the one in >> tick_nohz_update_jiffies() needs to go. >> >> Sorry.. I got entirely confused figuring out wth happened with 3.6. >> > High loadavg reported with v3.6, and I just checked the upstream code, > which puzzled many people. Sorry for that~ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h
On Friday 12 October 2012 22:26:36 Steven Rostedt wrote: > From: Steven Rostedt > > All the headers but kvm_para.h use the Kbuild infrastructure to > get to the asm-generic headers. Acked-by: Mike Frysinger -mike signature.asc Description: This is a digitally signed message part.
Re: [PATCH] [media] stk1160: Remove dead code from stk1160_i2c_read_reg()
On Sun, Nov 9, 2008 at 2:04 PM, Jesper Juhl wrote: > There are two checks for 'rc' being less than zero with no change to > 'rc' between the two, so the second is just dead code - remove it. > > Signed-off-by: Jesper Juhl > --- > drivers/media/usb/stk1160/stk1160-i2c.c |3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/usb/stk1160/stk1160-i2c.c > b/drivers/media/usb/stk1160/stk1160-i2c.c > index 176ac93..035cf8c 100644 > --- a/drivers/media/usb/stk1160/stk1160-i2c.c > +++ b/drivers/media/usb/stk1160/stk1160-i2c.c > @@ -117,9 +117,6 @@ static int stk1160_i2c_read_reg(struct stk1160 *dev, u8 > addr, > return rc; > > stk1160_read_reg(dev, STK1160_SBUSR_RD, value); > - if (rc < 0) > - return rc; > - > return 0; > } > Thanks for doing this. Wouldn't you like to save stk1160_read_reg return code to rc, instead of this? Ezequiel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 20/25] sparc: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Date: Fri, 12 Oct 2012 22:26:52 -0400 > From: Steven Rostedt > > Use Kbuild infrastructure to handle the asm-generic headers > and remove the wrapper headers that call them. > > This only affects headers that do nothing but include the generic > equivalent. It does not touch any header that does a little more. > > Cc: linux-kbu...@vger.kernel.org > Cc: sparcli...@vger.kernel.org > Cc: "David S. Miller" > Signed-off-by: Steven Rostedt Acked-by: David S. Miller -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
question about /dev/root symlink
All, I am part of the team that maintains udev on gentoo. This bug [1] has prompted me to ask a couple of questions about the /dev/root symbolic link. According to upstream udev, we should not use this at all and if tools are relying on it they should be fixed to not do so. Does the kernel create this symbolic link in devtmpfs as suggested by [2] and [3]? If not, should I be writing custom udev helpers to create it? Thanks much for your time, William [1] https://bugs.gentoo.org/show_bug.cgi?id=390519 [2] https://bugs.gentoo.org/show_bug.cgi?id=390519#C20 [3] https://bugs.gentoo.org/show_bug.cgi?id=390519#C26 pgpgvSW9xo7pk.pgp Description: PGP signature
[PATCH 08/25] h8300: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: Yoshinori Sato Signed-off-by: Steven Rostedt --- arch/h8300/include/asm/Kbuild | 23 +++ arch/h8300/include/asm/bitsperlong.h |1 - arch/h8300/include/asm/cputime.h |6 -- arch/h8300/include/asm/device.h|7 --- arch/h8300/include/asm/div64.h |1 - arch/h8300/include/asm/emergency-restart.h |6 -- arch/h8300/include/asm/errno.h |6 -- arch/h8300/include/asm/futex.h |6 -- arch/h8300/include/asm/ioctl.h |1 - arch/h8300/include/asm/irq_regs.h |1 - arch/h8300/include/asm/kdebug.h|1 - arch/h8300/include/asm/kmap_types.h|6 -- arch/h8300/include/asm/kvm_para.h |1 - arch/h8300/include/asm/local.h |6 -- arch/h8300/include/asm/local64.h |1 - arch/h8300/include/asm/mman.h |1 - arch/h8300/include/asm/percpu.h|6 -- arch/h8300/include/asm/resource.h |6 -- arch/h8300/include/asm/scatterlist.h |6 -- arch/h8300/include/asm/sections.h |6 -- arch/h8300/include/asm/siginfo.h |6 -- arch/h8300/include/asm/statfs.h|6 -- arch/h8300/include/asm/topology.h |6 -- arch/ia64/include/asm/ipcbuf.h |1 - 24 files changed, 23 insertions(+), 94 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h delete mode 100644 arch/h8300/include/asm/cputime.h delete mode 100644 arch/h8300/include/asm/device.h delete mode 100644 arch/h8300/include/asm/div64.h delete mode 100644 arch/h8300/include/asm/emergency-restart.h delete mode 100644 arch/h8300/include/asm/errno.h delete mode 100644 arch/h8300/include/asm/futex.h delete mode 100644 arch/h8300/include/asm/ioctl.h delete mode 100644 arch/h8300/include/asm/irq_regs.h delete mode 100644 arch/h8300/include/asm/kdebug.h delete mode 100644 arch/h8300/include/asm/kmap_types.h delete mode 100644 arch/h8300/include/asm/kvm_para.h delete mode 100644 arch/h8300/include/asm/local.h delete mode 100644 arch/h8300/include/asm/local64.h delete mode 100644 arch/h8300/include/asm/mman.h delete mode 100644 arch/h8300/include/asm/percpu.h delete mode 100644 arch/h8300/include/asm/resource.h delete mode 100644 arch/h8300/include/asm/scatterlist.h delete mode 100644 arch/h8300/include/asm/sections.h delete mode 100644 arch/h8300/include/asm/siginfo.h delete mode 100644 arch/h8300/include/asm/statfs.h delete mode 100644 arch/h8300/include/asm/topology.h delete mode 100644 arch/ia64/include/asm/ipcbuf.h diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild index fccd81e..aa6696e 100644 --- a/arch/h8300/include/asm/Kbuild +++ b/arch/h8300/include/asm/Kbuild @@ -1,4 +1,27 @@ include include/asm-generic/Kbuild.asm +generic-y += bitsperlong.h +generic-y += cputime.h generic-y += clkdev.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += errno.h generic-y += exec.h +generic-y += futex.h +generic-y += ioctl.h +generic-y += ipcbuf.h +generic-y += irq_regs.h +generic-y += kdebug.h +generic-y += kmap_types.h +generic-y += kvm_para.h +generic-y += local64.h +generic-y += local.h +generic-y += mman.h +generic-y += percpu.h +generic-y += resource.h +generic-y += scatterlist.h +generic-y += sections.h +generic-y += siginfo.h +generic-y += statfs.h +generic-y += topology.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index 6dc0bb0..000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/h8300/include/asm/cputime.h b/arch/h8300/include/asm/cputime.h deleted file mode 100644 index 092e187..000 --- a/arch/h8300/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __H8300_CPUTIME_H -#define __H8300_CPUTIME_H - -#include - -#endif /* __H8300_CPUTIME_H */ diff --git a/arch/h8300/include/asm/device.h b/arch/h8300/include/asm/device.h deleted file mode 100644 index d8f9872..000 --- a/arch/h8300/include/asm/device.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Arch specific extensions to struct device - * - * This file is released under the GPLv2 - */ -#include - diff --git a/arch/h8300/include/asm/div64.h b/arch/h8300/include/asm/div64.h deleted file mode 100644 index 6cd978c..000 --- a/arch/h8300/include/asm/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/h8300/include/asm/emergency-restart.h b/arch/h8300/include/asm/emergency-restart.h deleted file mode 100644 index
[PATCH 07/25] frv: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: David Howells Signed-off-by: Steven Rostedt --- arch/frv/include/asm/Kbuild | 19 +++ arch/frv/include/asm/bitsperlong.h |1 - arch/frv/include/asm/cputime.h |6 -- arch/frv/include/asm/device.h|7 --- arch/frv/include/asm/div64.h |1 - arch/frv/include/asm/emergency-restart.h |6 -- arch/frv/include/asm/errno.h |7 --- arch/frv/include/asm/fcntl.h |1 - arch/frv/include/asm/ioctl.h |1 - arch/frv/include/asm/kdebug.h|1 - arch/frv/include/asm/kvm_para.h |1 - arch/frv/include/asm/local.h |6 -- arch/frv/include/asm/local64.h |1 - arch/frv/include/asm/mman.h |1 - arch/frv/include/asm/percpu.h|6 -- arch/frv/include/asm/resource.h |7 --- arch/frv/include/asm/scatterlist.h |6 -- arch/frv/include/asm/statfs.h|7 --- arch/frv/include/asm/xor.h |1 - arch/h8300/include/asm/ipcbuf.h |1 - 20 files changed, 19 insertions(+), 68 deletions(-) delete mode 100644 arch/frv/include/asm/bitsperlong.h delete mode 100644 arch/frv/include/asm/cputime.h delete mode 100644 arch/frv/include/asm/device.h delete mode 100644 arch/frv/include/asm/div64.h delete mode 100644 arch/frv/include/asm/emergency-restart.h delete mode 100644 arch/frv/include/asm/errno.h delete mode 100644 arch/frv/include/asm/fcntl.h delete mode 100644 arch/frv/include/asm/ioctl.h delete mode 100644 arch/frv/include/asm/kdebug.h delete mode 100644 arch/frv/include/asm/kvm_para.h delete mode 100644 arch/frv/include/asm/local.h delete mode 100644 arch/frv/include/asm/local64.h delete mode 100644 arch/frv/include/asm/mman.h delete mode 100644 arch/frv/include/asm/percpu.h delete mode 100644 arch/frv/include/asm/resource.h delete mode 100644 arch/frv/include/asm/scatterlist.h delete mode 100644 arch/frv/include/asm/statfs.h delete mode 100644 arch/frv/include/asm/xor.h delete mode 100644 arch/h8300/include/asm/ipcbuf.h diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index 251bd71..1e46bc5 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild @@ -2,5 +2,24 @@ include include/asm-generic/Kbuild.asm header-y += registers.h header-y += termios.h +generic-y += bitsperlong.h generic-y += clkdev.h +generic-y += cputime.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += errno.h generic-y += exec.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ipcbuf.h +generic-y += kdebug.h +generic-y += kvm_para.h +generic-y += local64.h +generic-y += local.h +generic-y += mman.h +generic-y += percpu.h +generic-y += resource.h +generic-y += scatterlist.h +generic-y += statfs.h +generic-y += xor.h diff --git a/arch/frv/include/asm/bitsperlong.h b/arch/frv/include/asm/bitsperlong.h deleted file mode 100644 index 6dc0bb0..000 --- a/arch/frv/include/asm/bitsperlong.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/frv/include/asm/cputime.h b/arch/frv/include/asm/cputime.h deleted file mode 100644 index f6c373a..000 --- a/arch/frv/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_CPUTIME_H -#define _ASM_CPUTIME_H - -#include - -#endif /* _ASM_CPUTIME_H */ diff --git a/arch/frv/include/asm/device.h b/arch/frv/include/asm/device.h deleted file mode 100644 index d8f9872..000 --- a/arch/frv/include/asm/device.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Arch specific extensions to struct device - * - * This file is released under the GPLv2 - */ -#include - diff --git a/arch/frv/include/asm/div64.h b/arch/frv/include/asm/div64.h deleted file mode 100644 index 6cd978c..000 --- a/arch/frv/include/asm/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/frv/include/asm/emergency-restart.h b/arch/frv/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c4..000 --- a/arch/frv/include/asm/emergency-restart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include - -#endif /* _ASM_EMERGENCY_RESTART_H */ diff --git a/arch/frv/include/asm/errno.h b/arch/frv/include/asm/errno.h deleted file mode 100644 index d010795..000 --- a/arch/frv/include/asm/errno.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _ASM_ERRNO_H -#define _ASM_ERRNO_H - -#include - -#endif /* _ASM_ERRNO_H */ - diff --git a/arch/frv/include/asm/fcntl.h b/arch/frv/include/asm/fcntl.h deleted file mode 100644 index 46ab12d..000 ---
[PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h
From: Steven Rostedt All the headers but kvm_para.h use the Kbuild infrastructure to get to the asm-generic headers. Cc: linux-kbu...@vger.kernel.org Cc: uclinux-dist-de...@blackfin.uclinux.org Cc: Mike Frysinger Signed-off-by: Steven Rostedt --- arch/blackfin/include/asm/Kbuild |1 + arch/blackfin/include/asm/kvm_para.h |1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 arch/blackfin/include/asm/kvm_para.h diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild index 5a0625a..731b81a 100644 --- a/arch/blackfin/include/asm/Kbuild +++ b/arch/blackfin/include/asm/Kbuild @@ -17,6 +17,7 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h +generic-y += kvm_para.h generic-y += local64.h generic-y += local.h generic-y += mman.h diff --git a/arch/blackfin/include/asm/kvm_para.h b/arch/blackfin/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/blackfin/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 00/25] asm-generic: Convert all to use Kbuild file
Recently I suggested to someone that was adding a new asm file that currently only contained an x86 change to add a header in all archs that was just a wrapper to point to the asm-generic version. I suggested this because that's the way we use to do it and just to refresh my memory, I looked at div64.h in a few archs and saw that was the case. After having the change done and just after finishing testing it, I was notified that the "proper" way of doing this is to add it to the arch/*/include/asm/Kbuild file, as 'generic-y += foo.h' and it will reference the asm-generic file automatically. Well it would have been nice if I knew this before and wasn't confused by seeing the incorrect method. Thus, out of frustration, I went and cleaned up all the archs to have them use the Kbuild method and deleted the empty files. I spent a bit of time to make sure the only thing the file did was include the generic header and not add anything else. So if it only included the generic header and sometimes added the wrapper #ifndef _HEADER_H notations, I deleted the file and added it to Kbuild. What I would really like to do is get rid of the adding of these files all together (from even the Kbuild file), and just have by default, if the file does not exist in arch/*/include/asm/ but does in include/asm-generic/ then use the generic version. Why don't we do that now? I can look into doing this when I have more time. I tested these changes by cross compiling the defconfig for everything but: c6x, hexagon, microblaze, score, unicore because cross compilers for these archs are not available to me. Note, I first did the change against 3.6 but found that there's some isses with the check header but is fixed by David Howells changes in the current merge window. But it seems that the current merge window caused: frv, openrisc, ia64 and xtensa not to compile correctly (before adding these patches). I tested anyway, just to see if they added more errors. h8300 I have yet to get to compile (never ever compiled for me). But everything else has been crossed compiled by a defconfig and seems to work. Kudos to m68k and sh, those two were fully up-to-date with the new Kbuild method. Honorable mention goes to: blackfin, c6x, hexagon, openrisc, tile, um and unicore2 for being almost totally up to the new method, but it seems that kvm_para.h was added the old way. Please feel free to pluck these patches into your architecture and run them to make sure that they boot as well (I only had the compiler and not the box... Also I only tested with defconfig, I may have broken other configs). One note, the best thing about these changes is: 390 files changed, 369 insertions(+), 1378 deletions(-) -- Steve Steven Rostedt (25): alpha: Use Kbuild infrastructure to handle asm-generic headers arm: Use Kbuild infrastructure to handle asm-generic headers avr32: Use Kbuild infrastructure to handle asm-generic headers blackfin: Use Kbuild infrastructure for kvm_para.h c6x: Use Kbuild infrastructure for kvm_para.h cris: Use Kbuild infrastructure to handle asm-generic headers frv: Use Kbuild infrastructure to handle asm-generic headers h8300: Use Kbuild infrastructure to handle asm-generic headers hexagon: Use Kbuild infrastructure for kvm_para.h ia64: Use Kbuild infrastructure to handle asm-generic headers m32r: Use Kbuild infrastructure to handle asm-generic headers microblaze: Use Kbuild infrastructure to handle asm-generic headers mips: Use Kbuild infrastructure to handle asm-generic headers mn10300: Use Kbuild infrastructure to handle asm-generic headers openrisc: Use Kbuild infrastructure for kvm_para.h parisc: Use Kbuild infrastructure to handle asm-generic headers powerpc: Use Kbuild infrastructure to handle asm-generic headers s390: Use Kbuild infrastructure to handle asm-generic headers score: Use Kbuild infrastructure to handle asm-generic headers sparc: Use Kbuild infrastructure to handle asm-generic headers tile: Use Kbuild infrastructure for kvm_para.h um: Use Kbuild infrastructure for kvm_para.h unicore32: Use Kbuild infrastructure for kvm_para.h x86: Use Kbuild infrastructure to handle asm-generic headers xtensa: Use Kbuild infrastructure to handle asm-generic headers arch/alpha/include/asm/Kbuild | 12 ++ arch/alpha/include/asm/cputime.h|6 --- arch/alpha/include/asm/device.h |7 arch/alpha/include/asm/div64.h |1 - arch/alpha/include/asm/emergency-restart.h |6 --- arch/alpha/include/asm/ipcbuf.h |1 - arch/alpha/include/asm/irq_regs.h |1 - arch/alpha/include/asm/kdebug.h |1 - arch/alpha/include/asm/kvm_para.h |1 - arch/alpha/include/asm/local64.h|1 -
[PATCH 09/25] hexagon: Use Kbuild infrastructure for kvm_para.h
From: Steven Rostedt All the headers but kvm_para.h use the Kbuild infrastructure to get to the asm-generic headers. Cc: linux-kbu...@vger.kernel.org Cc: linux-hexa...@vger.kernel.org Cc: Richard Kuo Signed-off-by: Steven Rostedt --- arch/hexagon/include/asm/Kbuild |1 + arch/hexagon/include/asm/kvm_para.h |1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 arch/hexagon/include/asm/kvm_para.h diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 3364b696..616544f 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -26,6 +26,7 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h +generic-y += kvm_para.h generic-y += local64.h generic-y += local.h generic-y += local.h diff --git a/arch/hexagon/include/asm/kvm_para.h b/arch/hexagon/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/hexagon/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 10/25] ia64: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-i...@vger.kernel.org Cc: Tony Luck Cc: Fenghua Yu Signed-off-by: Steven Rostedt --- arch/ia64/include/asm/Kbuild | 10 ++ arch/ia64/include/asm/div64.h |1 - arch/ia64/include/asm/emergency-restart.h |6 -- arch/ia64/include/asm/errno.h |1 - arch/ia64/include/asm/ioctl.h |1 - arch/ia64/include/asm/ioctls.h|6 -- arch/ia64/include/asm/irq_regs.h |1 - arch/ia64/include/asm/local.h |1 - arch/ia64/include/asm/local64.h |1 - arch/ia64/include/asm/poll.h |1 - arch/m32r/include/asm/ipcbuf.h|1 - 11 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 arch/ia64/include/asm/div64.h delete mode 100644 arch/ia64/include/asm/emergency-restart.h delete mode 100644 arch/ia64/include/asm/errno.h delete mode 100644 arch/ia64/include/asm/ioctl.h delete mode 100644 arch/ia64/include/asm/ioctls.h delete mode 100644 arch/ia64/include/asm/irq_regs.h delete mode 100644 arch/ia64/include/asm/local.h delete mode 100644 arch/ia64/include/asm/local64.h delete mode 100644 arch/ia64/include/asm/poll.h delete mode 100644 arch/m32r/include/asm/ipcbuf.h diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index 562f593..379f35d 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild @@ -14,4 +14,14 @@ header-y += rse.h header-y += ucontext.h header-y += ustack.h generic-y += clkdev.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += errno.h generic-y += exec.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += irq_regs.h +generic-y += local64.h +generic-y += local.h +generic-y += poll.h diff --git a/arch/ia64/include/asm/div64.h b/arch/ia64/include/asm/div64.h deleted file mode 100644 index 6cd978c..000 --- a/arch/ia64/include/asm/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/ia64/include/asm/emergency-restart.h b/arch/ia64/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c4..000 --- a/arch/ia64/include/asm/emergency-restart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include - -#endif /* _ASM_EMERGENCY_RESTART_H */ diff --git a/arch/ia64/include/asm/errno.h b/arch/ia64/include/asm/errno.h deleted file mode 100644 index 4c82b50..000 --- a/arch/ia64/include/asm/errno.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/ia64/include/asm/ioctl.h b/arch/ia64/include/asm/ioctl.h deleted file mode 100644 index b279fe0..000 --- a/arch/ia64/include/asm/ioctl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/ia64/include/asm/ioctls.h b/arch/ia64/include/asm/ioctls.h deleted file mode 100644 index f3aab55..000 --- a/arch/ia64/include/asm/ioctls.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_IA64_IOCTLS_H -#define _ASM_IA64_IOCTLS_H - -#include - -#endif /* _ASM_IA64_IOCTLS_H */ diff --git a/arch/ia64/include/asm/irq_regs.h b/arch/ia64/include/asm/irq_regs.h deleted file mode 100644 index 3dd9c0b..000 --- a/arch/ia64/include/asm/irq_regs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/ia64/include/asm/local.h b/arch/ia64/include/asm/local.h deleted file mode 100644 index c11c530..000 --- a/arch/ia64/include/asm/local.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/ia64/include/asm/local64.h b/arch/ia64/include/asm/local64.h deleted file mode 100644 index 36c93b5..000 --- a/arch/ia64/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/ia64/include/asm/poll.h b/arch/ia64/include/asm/poll.h deleted file mode 100644 index c98509d..000 --- a/arch/ia64/include/asm/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/m32r/include/asm/ipcbuf.h b/arch/m32r/include/asm/ipcbuf.h deleted file mode 100644 index 84c7e51..000 --- a/arch/m32r/include/asm/ipcbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 01/25] alpha: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-al...@vger.kernel.org Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Signed-off-by: Steven Rostedt --- arch/alpha/include/asm/Kbuild | 12 arch/alpha/include/asm/cputime.h |6 -- arch/alpha/include/asm/device.h|7 --- arch/alpha/include/asm/div64.h |1 - arch/alpha/include/asm/emergency-restart.h |6 -- arch/alpha/include/asm/ipcbuf.h|1 - arch/alpha/include/asm/irq_regs.h |1 - arch/alpha/include/asm/kdebug.h|1 - arch/alpha/include/asm/kvm_para.h |1 - arch/alpha/include/asm/local64.h |1 - arch/alpha/include/asm/poll.h |1 - arch/alpha/include/asm/scatterlist.h |6 -- arch/alpha/include/asm/sections.h |7 --- 13 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 arch/alpha/include/asm/cputime.h delete mode 100644 arch/alpha/include/asm/device.h delete mode 100644 arch/alpha/include/asm/div64.h delete mode 100644 arch/alpha/include/asm/emergency-restart.h delete mode 100644 arch/alpha/include/asm/ipcbuf.h delete mode 100644 arch/alpha/include/asm/irq_regs.h delete mode 100644 arch/alpha/include/asm/kdebug.h delete mode 100644 arch/alpha/include/asm/kvm_para.h delete mode 100644 arch/alpha/include/asm/local64.h delete mode 100644 arch/alpha/include/asm/poll.h delete mode 100644 arch/alpha/include/asm/scatterlist.h delete mode 100644 arch/alpha/include/asm/sections.h diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index 64ffc9e..2bd12d6 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild @@ -10,4 +10,16 @@ header-y += pal.h header-y += reg.h header-y += regdef.h header-y += sysinfo.h +generic-y += cputime.h generic-y += exec.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += ipcbuf.h +generic-y += irq_regs.h +generic-y += kdebug.h +generic-y += kvm_para.h +generic-y += local64.h +generic-y += poll.h +generic-y += scatterlist.h +generic-y += sections.h diff --git a/arch/alpha/include/asm/cputime.h b/arch/alpha/include/asm/cputime.h deleted file mode 100644 index 19577fd..000 --- a/arch/alpha/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ALPHA_CPUTIME_H -#define __ALPHA_CPUTIME_H - -#include - -#endif /* __ALPHA_CPUTIME_H */ diff --git a/arch/alpha/include/asm/device.h b/arch/alpha/include/asm/device.h deleted file mode 100644 index d8f9872..000 --- a/arch/alpha/include/asm/device.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Arch specific extensions to struct device - * - * This file is released under the GPLv2 - */ -#include - diff --git a/arch/alpha/include/asm/div64.h b/arch/alpha/include/asm/div64.h deleted file mode 100644 index 6cd978c..000 --- a/arch/alpha/include/asm/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/alpha/include/asm/emergency-restart.h b/arch/alpha/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c4..000 --- a/arch/alpha/include/asm/emergency-restart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include - -#endif /* _ASM_EMERGENCY_RESTART_H */ diff --git a/arch/alpha/include/asm/ipcbuf.h b/arch/alpha/include/asm/ipcbuf.h deleted file mode 100644 index 84c7e51..000 --- a/arch/alpha/include/asm/ipcbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/alpha/include/asm/irq_regs.h b/arch/alpha/include/asm/irq_regs.h deleted file mode 100644 index 3dd9c0b..000 --- a/arch/alpha/include/asm/irq_regs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/alpha/include/asm/kdebug.h b/arch/alpha/include/asm/kdebug.h deleted file mode 100644 index 6ece1b0..000 --- a/arch/alpha/include/asm/kdebug.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/alpha/include/asm/kvm_para.h b/arch/alpha/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/alpha/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/alpha/include/asm/local64.h b/arch/alpha/include/asm/local64.h deleted file mode 100644 index 36c93b5..000 --- a/arch/alpha/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/alpha/include/asm/poll.h b/arch/alpha/include/asm/poll.h deleted file mode 100644 index c98509d..000 --- a/arch/alpha/include/asm/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/alpha/include/asm/scatterlist.h b/arch/alpha/include/asm/scatterlist.h deleted file mode 100644 index 017d747..000 ---
[PATCH 16/25] parisc: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-par...@vger.kernel.org Cc: "James E.J. Bottomley" Cc: Helge Deller Signed-off-by: Steven Rostedt --- arch/parisc/include/asm/Kbuild | 18 +- arch/parisc/include/asm/compat_signal.h |2 -- arch/parisc/include/asm/cputime.h |6 -- arch/parisc/include/asm/device.h|7 --- arch/parisc/include/asm/div64.h |1 - arch/parisc/include/asm/emergency-restart.h |6 -- arch/parisc/include/asm/hardirq.h | 11 --- arch/parisc/include/asm/irq_regs.h |1 - arch/parisc/include/asm/kdebug.h|1 - arch/parisc/include/asm/kvm_para.h |1 - arch/parisc/include/asm/local.h |1 - arch/parisc/include/asm/local64.h |1 - arch/parisc/include/asm/param.h |1 - arch/parisc/include/asm/percpu.h|7 --- arch/parisc/include/asm/poll.h |1 - arch/parisc/include/asm/topology.h |6 -- arch/parisc/include/asm/xor.h |1 - 17 files changed, 17 insertions(+), 55 deletions(-) delete mode 100644 arch/parisc/include/asm/compat_signal.h delete mode 100644 arch/parisc/include/asm/cputime.h delete mode 100644 arch/parisc/include/asm/device.h delete mode 100644 arch/parisc/include/asm/div64.h delete mode 100644 arch/parisc/include/asm/emergency-restart.h delete mode 100644 arch/parisc/include/asm/hardirq.h delete mode 100644 arch/parisc/include/asm/irq_regs.h delete mode 100644 arch/parisc/include/asm/kdebug.h delete mode 100644 arch/parisc/include/asm/kvm_para.h delete mode 100644 arch/parisc/include/asm/local.h delete mode 100644 arch/parisc/include/asm/local64.h delete mode 100644 arch/parisc/include/asm/param.h delete mode 100644 arch/parisc/include/asm/percpu.h delete mode 100644 arch/parisc/include/asm/poll.h delete mode 100644 arch/parisc/include/asm/topology.h delete mode 100644 arch/parisc/include/asm/xor.h diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild index 458371a..6ee772d 100644 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild @@ -1,6 +1,22 @@ include include/asm-generic/Kbuild.asm header-y += pdc.h +generic-y += compat_signal.h +generic-y += cputime.h generic-y += clkdev.h -generic-y += word-at-a-time.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h generic-y += exec.h +generic-y += hardirq.h +generic-y += irq_regs.h +generic-y += kdebug.h +generic-y += kvm_para.h +generic-y += local64.h +generic-y += local.h +generic-y += param.h +generic-y += percpu.h +generic-y += poll.h +generic-y += topology.h +generic-y += word-at-a-time.h +generic-y += xor.h diff --git a/arch/parisc/include/asm/compat_signal.h b/arch/parisc/include/asm/compat_signal.h deleted file mode 100644 index 6ad02c3..000 --- a/arch/parisc/include/asm/compat_signal.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Use generic */ -#include diff --git a/arch/parisc/include/asm/cputime.h b/arch/parisc/include/asm/cputime.h deleted file mode 100644 index dcdf2fb..000 --- a/arch/parisc/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __PARISC_CPUTIME_H -#define __PARISC_CPUTIME_H - -#include - -#endif /* __PARISC_CPUTIME_H */ diff --git a/arch/parisc/include/asm/device.h b/arch/parisc/include/asm/device.h deleted file mode 100644 index d8f9872..000 --- a/arch/parisc/include/asm/device.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Arch specific extensions to struct device - * - * This file is released under the GPLv2 - */ -#include - diff --git a/arch/parisc/include/asm/div64.h b/arch/parisc/include/asm/div64.h deleted file mode 100644 index 6cd978c..000 --- a/arch/parisc/include/asm/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/parisc/include/asm/emergency-restart.h b/arch/parisc/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c4..000 --- a/arch/parisc/include/asm/emergency-restart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include - -#endif /* _ASM_EMERGENCY_RESTART_H */ diff --git a/arch/parisc/include/asm/hardirq.h b/arch/parisc/include/asm/hardirq.h deleted file mode 100644 index 0d68184..000 --- a/arch/parisc/include/asm/hardirq.h +++ /dev/null @@ -1,11 +0,0 @@ -/* hardirq.h: PA-RISC hard IRQ support. - * - * Copyright (C) 2001 Matthew Wilcox - */ - -#ifndef _PARISC_HARDIRQ_H -#define _PARISC_HARDIRQ_H - -#include - -#endif /* _PARISC_HARDIRQ_H */ diff --git a/arch/parisc/include/asm/irq_regs.h b/arch/parisc/include/asm/irq_regs.h deleted file mode 100644 index
[PATCH 12/25] microblaze: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: microblaze-ucli...@itee.uq.edu.au Cc: Michal Simek Signed-off-by: Steven Rostedt --- arch/microblaze/include/asm/Kbuild | 46 +++ arch/microblaze/include/asm/bitops.h|1 - arch/microblaze/include/asm/bitsperlong.h |1 - arch/microblaze/include/asm/bug.h |1 - arch/microblaze/include/asm/bugs.h |1 - arch/microblaze/include/asm/cputime.h |1 - arch/microblaze/include/asm/div64.h |1 - arch/microblaze/include/asm/emergency-restart.h |1 - arch/microblaze/include/asm/errno.h |1 - arch/microblaze/include/asm/fb.h|1 - arch/microblaze/include/asm/fcntl.h |1 - arch/microblaze/include/asm/hardirq.h |1 - arch/microblaze/include/asm/ioctl.h |1 - arch/microblaze/include/asm/ioctls.h|1 - arch/microblaze/include/asm/irq_regs.h |1 - arch/microblaze/include/asm/kdebug.h|1 - arch/microblaze/include/asm/kmap_types.h|6 --- arch/microblaze/include/asm/kvm_para.h |1 - arch/microblaze/include/asm/local.h |1 - arch/microblaze/include/asm/local64.h |1 - arch/microblaze/include/asm/mman.h |1 - arch/microblaze/include/asm/msgbuf.h|1 - arch/microblaze/include/asm/param.h |1 - arch/microblaze/include/asm/parport.h |1 - arch/microblaze/include/asm/percpu.h|1 - arch/microblaze/include/asm/poll.h |1 - arch/microblaze/include/asm/resource.h |1 - arch/microblaze/include/asm/scatterlist.h |1 - arch/microblaze/include/asm/sembuf.h|1 - arch/microblaze/include/asm/serial.h|1 - arch/microblaze/include/asm/shmbuf.h|1 - arch/microblaze/include/asm/shmparam.h |1 - arch/microblaze/include/asm/siginfo.h |1 - arch/microblaze/include/asm/signal.h|1 - arch/microblaze/include/asm/socket.h|1 - arch/microblaze/include/asm/sockios.h |1 - arch/microblaze/include/asm/stat.h |1 - arch/microblaze/include/asm/statfs.h|1 - arch/microblaze/include/asm/swab.h |1 - arch/microblaze/include/asm/termbits.h |1 - arch/microblaze/include/asm/termios.h |1 - arch/microblaze/include/asm/topology.h |1 - arch/microblaze/include/asm/types.h |1 - arch/microblaze/include/asm/ucontext.h |1 - arch/microblaze/include/asm/vga.h |1 - arch/microblaze/include/asm/xor.h |1 - arch/mips/include/asm/ipcbuf.h |1 - 47 files changed, 46 insertions(+), 51 deletions(-) delete mode 100644 arch/microblaze/include/asm/bitops.h delete mode 100644 arch/microblaze/include/asm/bitsperlong.h delete mode 100644 arch/microblaze/include/asm/bug.h delete mode 100644 arch/microblaze/include/asm/bugs.h delete mode 100644 arch/microblaze/include/asm/cputime.h delete mode 100644 arch/microblaze/include/asm/div64.h delete mode 100644 arch/microblaze/include/asm/emergency-restart.h delete mode 100644 arch/microblaze/include/asm/errno.h delete mode 100644 arch/microblaze/include/asm/fb.h delete mode 100644 arch/microblaze/include/asm/fcntl.h delete mode 100644 arch/microblaze/include/asm/hardirq.h delete mode 100644 arch/microblaze/include/asm/ioctl.h delete mode 100644 arch/microblaze/include/asm/ioctls.h delete mode 100644 arch/microblaze/include/asm/irq_regs.h delete mode 100644 arch/microblaze/include/asm/kdebug.h delete mode 100644 arch/microblaze/include/asm/kmap_types.h delete mode 100644 arch/microblaze/include/asm/kvm_para.h delete mode 100644 arch/microblaze/include/asm/local.h delete mode 100644 arch/microblaze/include/asm/local64.h delete mode 100644 arch/microblaze/include/asm/mman.h delete mode 100644 arch/microblaze/include/asm/msgbuf.h delete mode 100644 arch/microblaze/include/asm/param.h delete mode 100644 arch/microblaze/include/asm/parport.h delete mode 100644 arch/microblaze/include/asm/percpu.h delete mode 100644 arch/microblaze/include/asm/poll.h delete mode 100644 arch/microblaze/include/asm/resource.h delete mode 100644 arch/microblaze/include/asm/scatterlist.h delete mode 100644 arch/microblaze/include/asm/sembuf.h delete mode 100644 arch/microblaze/include/asm/serial.h delete mode 100644 arch/microblaze/include/asm/shmbuf.h delete mode 100644 arch/microblaze/include/asm/shmparam.h delete mode 100644
[PATCH 20/25] sparc: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: sparcli...@vger.kernel.org Cc: "David S. Miller" Signed-off-by: Steven Rostedt --- arch/sparc/include/asm/Kbuild |5 + arch/sparc/include/asm/cputime.h |6 -- arch/sparc/include/asm/emergency-restart.h |6 -- arch/sparc/include/asm/kmap_types.h| 10 -- arch/sparc/include/uapi/asm/kvm_para.h |1 - arch/sparc/include/uapi/asm/statfs.h |6 -- 6 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 arch/sparc/include/asm/cputime.h delete mode 100644 arch/sparc/include/asm/emergency-restart.h delete mode 100644 arch/sparc/include/asm/kmap_types.h delete mode 100644 arch/sparc/include/uapi/asm/kvm_para.h delete mode 100644 arch/sparc/include/uapi/asm/statfs.h diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 10d54e5..22a0d45 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild @@ -1,10 +1,15 @@ # User exported sparc header files +generic-y += cputime.h generic-y += clkdev.h +generic-y += emergency-restart.h generic-y += div64.h generic-y += exec.h generic-y += local64.h generic-y += irq_regs.h +generic-y += kmap_types.h +generic-y += kvm_para.h generic-y += local.h +generic-y += statfs.h generic-y += word-at-a-time.h diff --git a/arch/sparc/include/asm/cputime.h b/arch/sparc/include/asm/cputime.h deleted file mode 100644 index 1a642b8..000 --- a/arch/sparc/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __SPARC_CPUTIME_H -#define __SPARC_CPUTIME_H - -#include - -#endif /* __SPARC_CPUTIME_H */ diff --git a/arch/sparc/include/asm/emergency-restart.h b/arch/sparc/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c4..000 --- a/arch/sparc/include/asm/emergency-restart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include - -#endif /* _ASM_EMERGENCY_RESTART_H */ diff --git a/arch/sparc/include/asm/kmap_types.h b/arch/sparc/include/asm/kmap_types.h deleted file mode 100644 index aad2174..000 --- a/arch/sparc/include/asm/kmap_types.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _ASM_KMAP_TYPES_H -#define _ASM_KMAP_TYPES_H - -/* Dummy header just to define km_type. None of this - * is actually used on sparc. -DaveM - */ - -#include - -#endif diff --git a/arch/sparc/include/uapi/asm/kvm_para.h b/arch/sparc/include/uapi/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/sparc/include/uapi/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/sparc/include/uapi/asm/statfs.h b/arch/sparc/include/uapi/asm/statfs.h deleted file mode 100644 index 55e607a..000 --- a/arch/sparc/include/uapi/asm/statfs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef ___ASM_SPARC_STATFS_H -#define ___ASM_SPARC_STATFS_H - -#include - -#endif -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 13/25] mips: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-m...@linux-mips.org Cc: Ralf Baechle Signed-off-by: Steven Rostedt --- arch/mips/include/asm/Kbuild | 14 ++ arch/mips/include/asm/cputime.h |6 -- arch/mips/include/asm/current.h |1 - arch/mips/include/asm/emergency-restart.h |6 -- arch/mips/include/asm/kvm_para.h |1 - arch/mips/include/asm/local64.h |1 - arch/mips/include/asm/parport.h |1 - arch/mips/include/asm/percpu.h|6 -- arch/mips/include/asm/scatterlist.h |6 -- arch/mips/include/asm/sections.h |6 -- arch/mips/include/asm/serial.h|1 - arch/mips/include/asm/ucontext.h |1 - arch/mips/include/asm/xor.h |1 - arch/mn10300/include/asm/ipcbuf.h |1 - 14 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 arch/mips/include/asm/cputime.h delete mode 100644 arch/mips/include/asm/current.h delete mode 100644 arch/mips/include/asm/emergency-restart.h delete mode 100644 arch/mips/include/asm/kvm_para.h delete mode 100644 arch/mips/include/asm/local64.h delete mode 100644 arch/mips/include/asm/parport.h delete mode 100644 arch/mips/include/asm/percpu.h delete mode 100644 arch/mips/include/asm/scatterlist.h delete mode 100644 arch/mips/include/asm/sections.h delete mode 100644 arch/mips/include/asm/serial.h delete mode 100644 arch/mips/include/asm/ucontext.h delete mode 100644 arch/mips/include/asm/xor.h delete mode 100644 arch/mn10300/include/asm/ipcbuf.h diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild index f53f9ca..b5a6509 100644 --- a/arch/mips/include/asm/Kbuild +++ b/arch/mips/include/asm/Kbuild @@ -3,3 +3,17 @@ include include/asm-generic/Kbuild.asm header-y += cachectl.h header-y += sgidefs.h header-y += sysmips.h + +generic-y += cputime.h +generic-y += current.h +generic-y += emergency-restart.h +generic-y += ipcbuf.h +generic-y += kvm_para.h +generic-y += local64.h +generic-y += parport.h +generic-y += percpu.h +generic-y += scatterlist.h +generic-y += sections.h +generic-y += serial.h +generic-y += ucontext.h +generic-y += xor.h diff --git a/arch/mips/include/asm/cputime.h b/arch/mips/include/asm/cputime.h deleted file mode 100644 index c00eacb..000 --- a/arch/mips/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __MIPS_CPUTIME_H -#define __MIPS_CPUTIME_H - -#include - -#endif /* __MIPS_CPUTIME_H */ diff --git a/arch/mips/include/asm/current.h b/arch/mips/include/asm/current.h deleted file mode 100644 index 4c51401..000 --- a/arch/mips/include/asm/current.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/mips/include/asm/emergency-restart.h b/arch/mips/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c4..000 --- a/arch/mips/include/asm/emergency-restart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include - -#endif /* _ASM_EMERGENCY_RESTART_H */ diff --git a/arch/mips/include/asm/kvm_para.h b/arch/mips/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/mips/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/mips/include/asm/local64.h b/arch/mips/include/asm/local64.h deleted file mode 100644 index 36c93b5..000 --- a/arch/mips/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/mips/include/asm/parport.h b/arch/mips/include/asm/parport.h deleted file mode 100644 index cf252af..000 --- a/arch/mips/include/asm/parport.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/mips/include/asm/percpu.h b/arch/mips/include/asm/percpu.h deleted file mode 100644 index 844e763..000 --- a/arch/mips/include/asm/percpu.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_PERCPU_H -#define __ASM_PERCPU_H - -#include - -#endif /* __ASM_PERCPU_H */ diff --git a/arch/mips/include/asm/scatterlist.h b/arch/mips/include/asm/scatterlist.h deleted file mode 100644 index 7ee0e64..000 --- a/arch/mips/include/asm/scatterlist.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_SCATTERLIST_H -#define __ASM_SCATTERLIST_H - -#include - -#endif /* __ASM_SCATTERLIST_H */ diff --git a/arch/mips/include/asm/sections.h b/arch/mips/include/asm/sections.h deleted file mode 100644 index b7e3726..000 --- a/arch/mips/include/asm/sections.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SECTIONS_H -#define _ASM_SECTIONS_H - -#include - -#endif /* _ASM_SECTIONS_H */ diff --git a/arch/mips/include/asm/serial.h b/arch/mips/include/asm/serial.h deleted file mode 100644 index a0cb0ca..000 ---
[PATCH 02/25] arm: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-arm-ker...@lists.infradead.org Cc: Russell King Signed-off-by: Steven Rostedt --- arch/arm/include/asm/Kbuild |2 ++ arch/arm/include/asm/kvm_para.h |1 - arch/avr32/include/asm/ipcbuf.h |1 - 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 arch/arm/include/asm/kvm_para.h delete mode 100644 arch/avr32/include/asm/ipcbuf.h diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index 8a7196c..ad80160 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@ -13,6 +13,7 @@ generic-y += ioctl.h generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h +generic-y += kvm_para.h generic-y += local.h generic-y += local64.h generic-y += msgbuf.h @@ -35,3 +36,4 @@ generic-y += termios.h generic-y += timex.h generic-y += types.h generic-y += unaligned.h +generic-y += ipcbuf.h diff --git a/arch/arm/include/asm/kvm_para.h b/arch/arm/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/arm/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/avr32/include/asm/ipcbuf.h b/arch/avr32/include/asm/ipcbuf.h deleted file mode 100644 index 84c7e51..000 --- a/arch/avr32/include/asm/ipcbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 17/25] powerpc: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linuxppc-...@lists.ozlabs.org Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Steven Rostedt --- arch/powerpc/include/asm/Kbuild |9 + arch/powerpc/include/asm/div64.h |1 - arch/powerpc/include/asm/emergency-restart.h |1 - arch/powerpc/include/asm/irq_regs.h |2 -- arch/powerpc/include/asm/local64.h |1 - arch/powerpc/include/asm/param.h |1 - arch/powerpc/include/asm/poll.h |1 - arch/powerpc/include/asm/resource.h |1 - arch/powerpc/include/asm/statfs.h|6 -- arch/powerpc/include/asm/xor.h |1 - 10 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 arch/powerpc/include/asm/div64.h delete mode 100644 arch/powerpc/include/asm/emergency-restart.h delete mode 100644 arch/powerpc/include/asm/irq_regs.h delete mode 100644 arch/powerpc/include/asm/local64.h delete mode 100644 arch/powerpc/include/asm/param.h delete mode 100644 arch/powerpc/include/asm/poll.h delete mode 100644 arch/powerpc/include/asm/resource.h delete mode 100644 arch/powerpc/include/asm/statfs.h delete mode 100644 arch/powerpc/include/asm/xor.h diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index ace53db..8ae0511 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild @@ -36,4 +36,13 @@ header-y += ucontext.h header-y += unistd.h generic-y += clkdev.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += irq_regs.h +generic-y += local64.h +generic-y += param.h +generic-y += poll.h +generic-y += resource.h generic-y += rwsem.h +generic-y += statfs.h +generic-y += xor.h diff --git a/arch/powerpc/include/asm/div64.h b/arch/powerpc/include/asm/div64.h deleted file mode 100644 index 6cd978c..000 --- a/arch/powerpc/include/asm/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/powerpc/include/asm/emergency-restart.h b/arch/powerpc/include/asm/emergency-restart.h deleted file mode 100644 index 3711bd9..000 --- a/arch/powerpc/include/asm/emergency-restart.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/powerpc/include/asm/irq_regs.h b/arch/powerpc/include/asm/irq_regs.h deleted file mode 100644 index ba94b51..000 --- a/arch/powerpc/include/asm/irq_regs.h +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/arch/powerpc/include/asm/local64.h b/arch/powerpc/include/asm/local64.h deleted file mode 100644 index 36c93b5..000 --- a/arch/powerpc/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/powerpc/include/asm/param.h b/arch/powerpc/include/asm/param.h deleted file mode 100644 index 965d454..000 --- a/arch/powerpc/include/asm/param.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/powerpc/include/asm/poll.h b/arch/powerpc/include/asm/poll.h deleted file mode 100644 index c98509d..000 --- a/arch/powerpc/include/asm/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/powerpc/include/asm/resource.h b/arch/powerpc/include/asm/resource.h deleted file mode 100644 index 04bc4db..000 --- a/arch/powerpc/include/asm/resource.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/powerpc/include/asm/statfs.h b/arch/powerpc/include/asm/statfs.h deleted file mode 100644 index 5244834..000 --- a/arch/powerpc/include/asm/statfs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_POWERPC_STATFS_H -#define _ASM_POWERPC_STATFS_H - -#include - -#endif diff --git a/arch/powerpc/include/asm/xor.h b/arch/powerpc/include/asm/xor.h deleted file mode 100644 index c82eb12..000 --- a/arch/powerpc/include/asm/xor.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 06/25] cris: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-cris-ker...@axis.com Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Steven Rostedt --- arch/cris/include/asm/Kbuild | 24 arch/cris/include/asm/bitsperlong.h |1 - arch/cris/include/asm/cputime.h |6 -- arch/cris/include/asm/device.h|7 --- arch/cris/include/asm/div64.h |1 - arch/cris/include/asm/emergency-restart.h |6 -- arch/cris/include/asm/errno.h |6 -- arch/cris/include/asm/fcntl.h |1 - arch/cris/include/asm/futex.h |6 -- arch/cris/include/asm/ioctl.h |1 - arch/cris/include/asm/irq_regs.h |1 - arch/cris/include/asm/kdebug.h|1 - arch/cris/include/asm/kmap_types.h| 10 -- arch/cris/include/asm/local.h |1 - arch/cris/include/asm/local64.h |1 - arch/cris/include/asm/mman.h |1 - arch/cris/include/asm/percpu.h|6 -- arch/cris/include/asm/poll.h |1 - arch/cris/include/asm/resource.h |6 -- arch/cris/include/asm/scatterlist.h |6 -- arch/cris/include/asm/sections.h |7 --- arch/cris/include/asm/siginfo.h |6 -- arch/cris/include/asm/statfs.h|6 -- arch/cris/include/asm/topology.h |6 -- arch/frv/include/asm/ipcbuf.h |1 - 25 files changed, 24 insertions(+), 95 deletions(-) delete mode 100644 arch/cris/include/asm/bitsperlong.h delete mode 100644 arch/cris/include/asm/cputime.h delete mode 100644 arch/cris/include/asm/device.h delete mode 100644 arch/cris/include/asm/div64.h delete mode 100644 arch/cris/include/asm/emergency-restart.h delete mode 100644 arch/cris/include/asm/errno.h delete mode 100644 arch/cris/include/asm/fcntl.h delete mode 100644 arch/cris/include/asm/futex.h delete mode 100644 arch/cris/include/asm/ioctl.h delete mode 100644 arch/cris/include/asm/irq_regs.h delete mode 100644 arch/cris/include/asm/kdebug.h delete mode 100644 arch/cris/include/asm/kmap_types.h delete mode 100644 arch/cris/include/asm/local.h delete mode 100644 arch/cris/include/asm/local64.h delete mode 100644 arch/cris/include/asm/mman.h delete mode 100644 arch/cris/include/asm/percpu.h delete mode 100644 arch/cris/include/asm/poll.h delete mode 100644 arch/cris/include/asm/resource.h delete mode 100644 arch/cris/include/asm/scatterlist.h delete mode 100644 arch/cris/include/asm/sections.h delete mode 100644 arch/cris/include/asm/siginfo.h delete mode 100644 arch/cris/include/asm/statfs.h delete mode 100644 arch/cris/include/asm/topology.h delete mode 100644 arch/frv/include/asm/ipcbuf.h diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index ff1bf7f..502409a 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -8,5 +8,29 @@ header-y += etraxgpio.h header-y += rs485.h header-y += sync_serial.h +generic-y += bitsperlong.h generic-y += clkdev.h +generic-y += cputime.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += errno.h generic-y += exec.h +generic-y += fcntl.h +generic-y += futex.h +generic-y += ioctl.h +generic-y += ipcbuf.h +generic-y += irq_regs.h +generic-y += kdebug.h +generic-y += kmap_types.h +generic-y += local64.h +generic-y += local.h +generic-y += mman.h +generic-y += percpu.h +generic-y += poll.h +generic-y += resource.h +generic-y += scatterlist.h +generic-y += sections.h +generic-y += siginfo.h +generic-y += statfs.h +generic-y += topology.h diff --git a/arch/cris/include/asm/bitsperlong.h b/arch/cris/include/asm/bitsperlong.h deleted file mode 100644 index 6dc0bb0..000 --- a/arch/cris/include/asm/bitsperlong.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/cris/include/asm/cputime.h b/arch/cris/include/asm/cputime.h deleted file mode 100644 index 4446a65..000 --- a/arch/cris/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __CRIS_CPUTIME_H -#define __CRIS_CPUTIME_H - -#include - -#endif /* __CRIS_CPUTIME_H */ diff --git a/arch/cris/include/asm/device.h b/arch/cris/include/asm/device.h deleted file mode 100644 index d8f9872..000 --- a/arch/cris/include/asm/device.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Arch specific extensions to struct device - * - * This file is released under the GPLv2 - */ -#include - diff --git a/arch/cris/include/asm/div64.h b/arch/cris/include/asm/div64.h deleted file mode 100644 index 6cd978c..000 --- a/arch/cris/include/asm/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include
[PATCH 11/25] m32r: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-m...@ml.linux-m32r.org Cc: Hirokazu Takata Signed-off-by: Steven Rostedt --- arch/m32r/include/asm/Kbuild | 28 arch/m32r/include/asm/bitsperlong.h |1 - arch/m32r/include/asm/bug.h |4 arch/m32r/include/asm/cputime.h |6 -- arch/m32r/include/asm/delay.h |1 - arch/m32r/include/asm/device.h|7 --- arch/m32r/include/asm/div64.h |1 - arch/m32r/include/asm/emergency-restart.h |6 -- arch/m32r/include/asm/errno.h |6 -- arch/m32r/include/asm/fcntl.h |1 - arch/m32r/include/asm/futex.h |6 -- arch/m32r/include/asm/ioctl.h |1 - arch/m32r/include/asm/ioctls.h|6 -- arch/m32r/include/asm/irq_regs.h |1 - arch/m32r/include/asm/kdebug.h|1 - arch/m32r/include/asm/local64.h |1 - arch/m32r/include/asm/mman.h |1 - arch/m32r/include/asm/param.h |7 --- arch/m32r/include/asm/pci.h |6 -- arch/m32r/include/asm/percpu.h|6 -- arch/m32r/include/asm/poll.h |1 - arch/m32r/include/asm/resource.h |6 -- arch/m32r/include/asm/scatterlist.h |6 -- arch/m32r/include/asm/sections.h |7 --- arch/m32r/include/asm/siginfo.h |6 -- arch/m32r/include/asm/statfs.h|6 -- arch/m32r/include/asm/topology.h |6 -- arch/m32r/include/asm/xor.h |6 -- arch/microblaze/include/asm/ipcbuf.h |1 - 29 files changed, 28 insertions(+), 114 deletions(-) delete mode 100644 arch/m32r/include/asm/bitsperlong.h delete mode 100644 arch/m32r/include/asm/bug.h delete mode 100644 arch/m32r/include/asm/cputime.h delete mode 100644 arch/m32r/include/asm/delay.h delete mode 100644 arch/m32r/include/asm/device.h delete mode 100644 arch/m32r/include/asm/div64.h delete mode 100644 arch/m32r/include/asm/emergency-restart.h delete mode 100644 arch/m32r/include/asm/errno.h delete mode 100644 arch/m32r/include/asm/fcntl.h delete mode 100644 arch/m32r/include/asm/futex.h delete mode 100644 arch/m32r/include/asm/ioctl.h delete mode 100644 arch/m32r/include/asm/ioctls.h delete mode 100644 arch/m32r/include/asm/irq_regs.h delete mode 100644 arch/m32r/include/asm/kdebug.h delete mode 100644 arch/m32r/include/asm/local64.h delete mode 100644 arch/m32r/include/asm/mman.h delete mode 100644 arch/m32r/include/asm/param.h delete mode 100644 arch/m32r/include/asm/pci.h delete mode 100644 arch/m32r/include/asm/percpu.h delete mode 100644 arch/m32r/include/asm/poll.h delete mode 100644 arch/m32r/include/asm/resource.h delete mode 100644 arch/m32r/include/asm/scatterlist.h delete mode 100644 arch/m32r/include/asm/sections.h delete mode 100644 arch/m32r/include/asm/siginfo.h delete mode 100644 arch/m32r/include/asm/statfs.h delete mode 100644 arch/m32r/include/asm/topology.h delete mode 100644 arch/m32r/include/asm/xor.h delete mode 100644 arch/microblaze/include/asm/ipcbuf.h diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild index fccd81e..2cde298 100644 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild @@ -1,4 +1,32 @@ include include/asm-generic/Kbuild.asm +generic-y += bitsperlong.h +generic-y += bug.h +generic-y += cputime.h generic-y += clkdev.h +generic-y += delay.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += errno.h generic-y += exec.h +generic-y += fcntl.h +generic-y += futex.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += irq_regs.h +generic-y += kdebug.h +generic-y += local64.h +generic-y += mman.h +generic-y += param.h +generic-y += pci.h +generic-y += percpu.h +generic-y += poll.h +generic-y += resource.h +generic-y += scatterlist.h +generic-y += sections.h +generic-y += siginfo.h +generic-y += statfs.h +generic-y += topology.h +generic-y += xor.h diff --git a/arch/m32r/include/asm/bitsperlong.h b/arch/m32r/include/asm/bitsperlong.h deleted file mode 100644 index 6dc0bb0..000 --- a/arch/m32r/include/asm/bitsperlong.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/m32r/include/asm/bug.h b/arch/m32r/include/asm/bug.h deleted file mode 100644 index 4cc0462..000 --- a/arch/m32r/include/asm/bug.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _M32R_BUG_H -#define _M32R_BUG_H -#include -#endif diff --git a/arch/m32r/include/asm/cputime.h b/arch/m32r/include/asm/cputime.h deleted file mode
[PATCH 14/25] mn10300: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-am33-l...@redhat.com Cc: David Howells Cc: Koichi Yasutake Signed-off-by: Steven Rostedt --- arch/mn10300/include/asm/Kbuild | 23 +++ arch/mn10300/include/asm/bitsperlong.h |1 - arch/mn10300/include/asm/cputime.h |1 - arch/mn10300/include/asm/device.h|1 - arch/mn10300/include/asm/emergency-restart.h |1 - arch/mn10300/include/asm/errno.h |1 - arch/mn10300/include/asm/fcntl.h |1 - arch/mn10300/include/asm/futex.h |1 - arch/mn10300/include/asm/ioctl.h |1 - arch/mn10300/include/asm/ioctls.h|6 -- arch/mn10300/include/asm/kmap_types.h|6 -- arch/mn10300/include/asm/kvm_para.h |1 - arch/mn10300/include/asm/local.h |1 - arch/mn10300/include/asm/local64.h |1 - arch/mn10300/include/asm/percpu.h|1 - arch/mn10300/include/asm/poll.h |1 - arch/mn10300/include/asm/resource.h |1 - arch/mn10300/include/asm/scatterlist.h | 16 arch/mn10300/include/asm/sections.h |1 - arch/mn10300/include/asm/siginfo.h |1 - arch/mn10300/include/asm/statfs.h|1 - arch/mn10300/include/asm/topology.h |1 - arch/mn10300/include/asm/xor.h |1 - arch/x86/include/asm/ipcbuf.h|1 - 24 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 arch/mn10300/include/asm/bitsperlong.h delete mode 100644 arch/mn10300/include/asm/cputime.h delete mode 100644 arch/mn10300/include/asm/device.h delete mode 100644 arch/mn10300/include/asm/emergency-restart.h delete mode 100644 arch/mn10300/include/asm/errno.h delete mode 100644 arch/mn10300/include/asm/fcntl.h delete mode 100644 arch/mn10300/include/asm/futex.h delete mode 100644 arch/mn10300/include/asm/ioctl.h delete mode 100644 arch/mn10300/include/asm/ioctls.h delete mode 100644 arch/mn10300/include/asm/kmap_types.h delete mode 100644 arch/mn10300/include/asm/kvm_para.h delete mode 100644 arch/mn10300/include/asm/local.h delete mode 100644 arch/mn10300/include/asm/local64.h delete mode 100644 arch/mn10300/include/asm/percpu.h delete mode 100644 arch/mn10300/include/asm/poll.h delete mode 100644 arch/mn10300/include/asm/resource.h delete mode 100644 arch/mn10300/include/asm/scatterlist.h delete mode 100644 arch/mn10300/include/asm/sections.h delete mode 100644 arch/mn10300/include/asm/siginfo.h delete mode 100644 arch/mn10300/include/asm/statfs.h delete mode 100644 arch/mn10300/include/asm/topology.h delete mode 100644 arch/mn10300/include/asm/xor.h delete mode 100644 arch/x86/include/asm/ipcbuf.h diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild index fccd81e..df065d7 100644 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild @@ -1,4 +1,27 @@ include include/asm-generic/Kbuild.asm +generic-y += bitsperlong.h +generic-y += cputime.h generic-y += clkdev.h +generic-y += device.h +generic-y += emergency-restart.h +generic-y += errno.h generic-y += exec.h +generic-y += fcntl.h +generic-y += futex.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += kmap_types.h +generic-y += kvm_para.h +generic-y += local64.h +generic-y += local.h +generic-y += percpu.h +generic-y += poll.h +generic-y += resource.h +generic-y += scatterlist.h +generic-y += sections.h +generic-y += siginfo.h +generic-y += statfs.h +generic-y += topology.h +generic-y += xor.h diff --git a/arch/mn10300/include/asm/bitsperlong.h b/arch/mn10300/include/asm/bitsperlong.h deleted file mode 100644 index 6dc0bb0..000 --- a/arch/mn10300/include/asm/bitsperlong.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/mn10300/include/asm/cputime.h b/arch/mn10300/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..000 --- a/arch/mn10300/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/mn10300/include/asm/device.h b/arch/mn10300/include/asm/device.h deleted file mode 100644 index f0a4c25..000 --- a/arch/mn10300/include/asm/device.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/mn10300/include/asm/emergency-restart.h b/arch/mn10300/include/asm/emergency-restart.h deleted file mode 100644 index 3711bd9..000 --- a/arch/mn10300/include/asm/emergency-restart.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/mn10300/include/asm/errno.h b/arch/mn10300/include/asm/errno.h deleted file mode 100644 index 4c82b50..000 --- a/arch/mn10300/include/asm/errno.h +++
[PATCH 18/25] s390: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-s...@vger.kernel.org Cc: linux...@de.ibm.com Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Steven Rostedt --- arch/s390/include/asm/Kbuild | 17 - arch/s390/include/asm/device.h|7 --- arch/s390/include/asm/div64.h |1 - arch/s390/include/asm/emergency-restart.h |6 -- arch/s390/include/asm/irq_regs.h |1 - arch/s390/include/asm/kmap_types.h|6 -- arch/s390/include/asm/local.h |1 - arch/s390/include/asm/local64.h |1 - arch/s390/include/asm/xor.h |1 - arch/s390/include/uapi/asm/errno.h| 11 --- arch/s390/include/uapi/asm/fcntl.h|1 - arch/s390/include/uapi/asm/ioctl.h|1 - arch/s390/include/uapi/asm/param.h|6 -- arch/s390/include/uapi/asm/poll.h |1 - arch/s390/include/uapi/asm/resource.h | 13 - arch/s390/include/uapi/asm/sockios.h |6 -- arch/s390/include/uapi/asm/termbits.h |6 -- 17 files changed, 16 insertions(+), 70 deletions(-) delete mode 100644 arch/s390/include/asm/device.h delete mode 100644 arch/s390/include/asm/div64.h delete mode 100644 arch/s390/include/asm/emergency-restart.h delete mode 100644 arch/s390/include/asm/irq_regs.h delete mode 100644 arch/s390/include/asm/kmap_types.h delete mode 100644 arch/s390/include/asm/local.h delete mode 100644 arch/s390/include/asm/local64.h delete mode 100644 arch/s390/include/asm/xor.h delete mode 100644 arch/s390/include/uapi/asm/errno.h delete mode 100644 arch/s390/include/uapi/asm/fcntl.h delete mode 100644 arch/s390/include/uapi/asm/ioctl.h delete mode 100644 arch/s390/include/uapi/asm/param.h delete mode 100644 arch/s390/include/uapi/asm/poll.h delete mode 100644 arch/s390/include/uapi/asm/resource.h delete mode 100644 arch/s390/include/uapi/asm/sockios.h delete mode 100644 arch/s390/include/uapi/asm/termbits.h diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 0633dc6..2e52285 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild @@ -1,3 +1,18 @@ - generic-y += clkdev.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += irq_regs.h +generic-y += kmap_types.h +generic-y += local64.h +generic-y += local.h +generic-y += param.h +generic-y += poll.h +generic-y += resource.h +generic-y += sockios.h +generic-y += termbits.h +generic-y += xor.h diff --git a/arch/s390/include/asm/device.h b/arch/s390/include/asm/device.h deleted file mode 100644 index d8f9872..000 --- a/arch/s390/include/asm/device.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Arch specific extensions to struct device - * - * This file is released under the GPLv2 - */ -#include - diff --git a/arch/s390/include/asm/div64.h b/arch/s390/include/asm/div64.h deleted file mode 100644 index 6cd978c..000 --- a/arch/s390/include/asm/div64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/s390/include/asm/emergency-restart.h b/arch/s390/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c4..000 --- a/arch/s390/include/asm/emergency-restart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include - -#endif /* _ASM_EMERGENCY_RESTART_H */ diff --git a/arch/s390/include/asm/irq_regs.h b/arch/s390/include/asm/irq_regs.h deleted file mode 100644 index 3dd9c0b..000 --- a/arch/s390/include/asm/irq_regs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/s390/include/asm/kmap_types.h b/arch/s390/include/asm/kmap_types.h deleted file mode 100644 index 0a88622..000 --- a/arch/s390/include/asm/kmap_types.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_KMAP_TYPES_H -#define _ASM_KMAP_TYPES_H - -#include - -#endif diff --git a/arch/s390/include/asm/local.h b/arch/s390/include/asm/local.h deleted file mode 100644 index c11c530..000 --- a/arch/s390/include/asm/local.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/s390/include/asm/local64.h b/arch/s390/include/asm/local64.h deleted file mode 100644 index 36c93b5..000 --- a/arch/s390/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/s390/include/asm/xor.h b/arch/s390/include/asm/xor.h deleted file mode 100644 index c82eb12..000 --- a/arch/s390/include/asm/xor.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/s390/include/uapi/asm/errno.h b/arch/s390/include/uapi/asm/errno.h deleted file mode 100644 index 395e97d..000 ---
[PATCH 19/25] score: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: Chen Liqin Cc: Lennox Wu Signed-off-by: Steven Rostedt --- arch/score/include/asm/Kbuild | 44 arch/score/include/asm/bitsperlong.h |6 arch/score/include/asm/bugs.h |6 arch/score/include/asm/cputime.h |6 arch/score/include/asm/current.h |6 arch/score/include/asm/device.h|6 arch/score/include/asm/div64.h |6 arch/score/include/asm/emergency-restart.h |6 arch/score/include/asm/errno.h |6 arch/score/include/asm/fcntl.h |6 arch/score/include/asm/futex.h |6 arch/score/include/asm/hardirq.h |6 arch/score/include/asm/ioctl.h |6 arch/score/include/asm/ioctls.h|6 arch/score/include/asm/ipcbuf.h|6 arch/score/include/asm/kdebug.h|6 arch/score/include/asm/kmap_types.h|6 arch/score/include/asm/kvm_para.h |1 - arch/score/include/asm/local.h |6 arch/score/include/asm/local64.h |1 - arch/score/include/asm/mman.h |6 arch/score/include/asm/msgbuf.h|6 arch/score/include/asm/param.h |6 arch/score/include/asm/percpu.h|6 arch/score/include/asm/poll.h |6 arch/score/include/asm/posix_types.h |6 arch/score/include/asm/resource.h |6 arch/score/include/asm/scatterlist.h |6 arch/score/include/asm/sections.h |6 arch/score/include/asm/sembuf.h|6 arch/score/include/asm/shmbuf.h|6 arch/score/include/asm/shmparam.h |6 arch/score/include/asm/siginfo.h |6 arch/score/include/asm/signal.h|6 arch/score/include/asm/socket.h|6 arch/score/include/asm/sockios.h |6 arch/score/include/asm/stat.h |6 arch/score/include/asm/statfs.h|6 arch/score/include/asm/swab.h |6 arch/score/include/asm/termbits.h |6 arch/score/include/asm/termios.h |6 arch/score/include/asm/topology.h |6 arch/score/include/asm/types.h |6 arch/score/include/asm/ucontext.h |1 - arch/score/include/asm/unaligned.h |6 45 files changed, 44 insertions(+), 249 deletions(-) delete mode 100644 arch/score/include/asm/bitsperlong.h delete mode 100644 arch/score/include/asm/bugs.h delete mode 100644 arch/score/include/asm/cputime.h delete mode 100644 arch/score/include/asm/current.h delete mode 100644 arch/score/include/asm/device.h delete mode 100644 arch/score/include/asm/div64.h delete mode 100644 arch/score/include/asm/emergency-restart.h delete mode 100644 arch/score/include/asm/errno.h delete mode 100644 arch/score/include/asm/fcntl.h delete mode 100644 arch/score/include/asm/futex.h delete mode 100644 arch/score/include/asm/hardirq.h delete mode 100644 arch/score/include/asm/ioctl.h delete mode 100644 arch/score/include/asm/ioctls.h delete mode 100644 arch/score/include/asm/ipcbuf.h delete mode 100644 arch/score/include/asm/kdebug.h delete mode 100644 arch/score/include/asm/kmap_types.h delete mode 100644 arch/score/include/asm/kvm_para.h delete mode 100644 arch/score/include/asm/local.h delete mode 100644 arch/score/include/asm/local64.h delete mode 100644 arch/score/include/asm/mman.h delete mode 100644 arch/score/include/asm/msgbuf.h delete mode 100644 arch/score/include/asm/param.h delete mode 100644 arch/score/include/asm/percpu.h delete mode 100644 arch/score/include/asm/poll.h delete mode 100644 arch/score/include/asm/posix_types.h delete mode 100644 arch/score/include/asm/resource.h delete mode 100644 arch/score/include/asm/scatterlist.h delete mode 100644 arch/score/include/asm/sections.h delete mode 100644 arch/score/include/asm/sembuf.h delete mode 100644 arch/score/include/asm/shmbuf.h delete mode 100644 arch/score/include/asm/shmparam.h delete mode 100644 arch/score/include/asm/siginfo.h delete mode 100644 arch/score/include/asm/signal.h delete mode 100644 arch/score/include/asm/socket.h delete mode 100644 arch/score/include/asm/sockios.h delete mode 100644 arch/score/include/asm/stat.h delete mode 100644 arch/score/include/asm/statfs.h delete mode 100644 arch/score/include/asm/swab.h delete mode 100644
[PATCH 22/25] um: Use Kbuild infrastructure for kvm_para.h
From: Steven Rostedt All the headers but kvm_para.h use the Kbuild infrastructure to get to the asm-generic headers. (also had to add ipcbuf.h) Cc: linux-kbu...@vger.kernel.org Cc: user-mode-linux-de...@lists.sourceforge.net Cc: Jeff Dike Cc: Richard Weinberger Signed-off-by: Steven Rostedt --- arch/um/include/asm/Kbuild |2 +- arch/um/include/asm/kvm_para.h |1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 arch/um/include/asm/kvm_para.h diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index 0f6e7b3..ad316e7 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -1,4 +1,4 @@ generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h -generic-y += switch_to.h clkdev.h +generic-y += switch_to.h clkdev.h kvm_para.h ipcbuf.h diff --git a/arch/um/include/asm/kvm_para.h b/arch/um/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/um/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 05/25] c6x: Use Kbuild infrastructure for kvm_para.h
From: Steven Rostedt All the headers but kvm_para.h use the Kbuild infrastructure to get to the asm-generic headers. Cc: linux-kbu...@vger.kernel.org Cc: linux-c6x-...@linux-c6x.org Cc: Mark Salter Cc: Aurelien Jacquiot Signed-off-by: Steven Rostedt --- arch/c6x/include/asm/Kbuild |1 + arch/c6x/include/asm/kvm_para.h |1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 arch/c6x/include/asm/kvm_para.h diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild index 4e4e98d..77d2617 100644 --- a/arch/c6x/include/asm/Kbuild +++ b/arch/c6x/include/asm/Kbuild @@ -24,6 +24,7 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h +generic-y += kvm_para.h generic-y += local.h generic-y += mman.h generic-y += mmu_context.h diff --git a/arch/c6x/include/asm/kvm_para.h b/arch/c6x/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/c6x/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 24/25] x86: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: x...@kernel.org Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Steven Rostedt --- arch/x86/include/asm/Kbuild | 18 ++ arch/x86/include/asm/cputime.h |1 - arch/x86/include/asm/errno.h|1 - arch/x86/include/asm/fcntl.h|1 - arch/x86/include/asm/ioctl.h|1 - arch/x86/include/asm/ioctls.h |1 - arch/x86/include/asm/local64.h |1 - arch/x86/include/asm/msgbuf.h |1 - arch/x86/include/asm/param.h|1 - arch/x86/include/asm/poll.h |1 - arch/x86/include/asm/resource.h |1 - arch/x86/include/asm/rtc.h |1 - arch/x86/include/asm/shmbuf.h |1 - arch/x86/include/asm/socket.h |1 - arch/x86/include/asm/sockios.h |1 - arch/x86/include/asm/termbits.h |1 - arch/x86/include/asm/termios.h |1 - arch/x86/include/asm/types.h|6 -- 18 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 arch/x86/include/asm/cputime.h delete mode 100644 arch/x86/include/asm/errno.h delete mode 100644 arch/x86/include/asm/fcntl.h delete mode 100644 arch/x86/include/asm/ioctl.h delete mode 100644 arch/x86/include/asm/ioctls.h delete mode 100644 arch/x86/include/asm/local64.h delete mode 100644 arch/x86/include/asm/msgbuf.h delete mode 100644 arch/x86/include/asm/param.h delete mode 100644 arch/x86/include/asm/poll.h delete mode 100644 arch/x86/include/asm/resource.h delete mode 100644 arch/x86/include/asm/rtc.h delete mode 100644 arch/x86/include/asm/shmbuf.h delete mode 100644 arch/x86/include/asm/socket.h delete mode 100644 arch/x86/include/asm/sockios.h delete mode 100644 arch/x86/include/asm/termbits.h delete mode 100644 arch/x86/include/asm/termios.h delete mode 100644 arch/x86/include/asm/types.h diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index 66e5f0e..eb28799 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@ -27,4 +27,22 @@ genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h +generic-y += cputime.h generic-y += clkdev.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += local64.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += resource.h +generic-y += rtc.h +generic-y += shmbuf.h +generic-y += socket.h +generic-y += sockios.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h diff --git a/arch/x86/include/asm/cputime.h b/arch/x86/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..000 --- a/arch/x86/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/errno.h b/arch/x86/include/asm/errno.h deleted file mode 100644 index 4c82b50..000 --- a/arch/x86/include/asm/errno.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/fcntl.h b/arch/x86/include/asm/fcntl.h deleted file mode 100644 index 46ab12d..000 --- a/arch/x86/include/asm/fcntl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/ioctl.h b/arch/x86/include/asm/ioctl.h deleted file mode 100644 index b279fe0..000 --- a/arch/x86/include/asm/ioctl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/ioctls.h b/arch/x86/include/asm/ioctls.h deleted file mode 100644 index ec34c76..000 --- a/arch/x86/include/asm/ioctls.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/local64.h b/arch/x86/include/asm/local64.h deleted file mode 100644 index 36c93b5..000 --- a/arch/x86/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/msgbuf.h b/arch/x86/include/asm/msgbuf.h deleted file mode 100644 index 809134c..000 --- a/arch/x86/include/asm/msgbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/param.h b/arch/x86/include/asm/param.h deleted file mode 100644 index 965d454..000 --- a/arch/x86/include/asm/param.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/poll.h b/arch/x86/include/asm/poll.h deleted file mode 100644 index c98509d..000 --- a/arch/x86/include/asm/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/resource.h b/arch/x86/include/asm/resource.h deleted file mode 100644 index 04bc4db..000 --- a/arch/x86/include/asm/resource.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/rtc.h b/arch/x86/include/asm/rtc.h deleted file mode 100644 index f71c3b0..000 --- a/arch/x86/include/asm/rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/include/asm/shmbuf.h
[PATCH 25/25] xtensa: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: linux-xte...@linux-xtensa.org Cc: Chris Zankel Cc: Max Filippov Signed-off-by: Steven Rostedt --- arch/xtensa/include/asm/Kbuild | 25 + arch/xtensa/include/asm/bitsperlong.h |1 - arch/xtensa/include/asm/bug.h | 18 -- arch/xtensa/include/asm/cputime.h |6 -- arch/xtensa/include/asm/device.h|7 --- arch/xtensa/include/asm/div64.h | 16 arch/xtensa/include/asm/emergency-restart.h |6 -- arch/xtensa/include/asm/errno.h | 16 arch/xtensa/include/asm/fcntl.h |1 - arch/xtensa/include/asm/futex.h |1 - arch/xtensa/include/asm/hardirq.h | 16 arch/xtensa/include/asm/ioctl.h |1 - arch/xtensa/include/asm/irq_regs.h |1 - arch/xtensa/include/asm/kdebug.h|1 - arch/xtensa/include/asm/kmap_types.h|6 -- arch/xtensa/include/asm/kvm_para.h |1 - arch/xtensa/include/asm/local.h | 16 arch/xtensa/include/asm/local64.h |1 - arch/xtensa/include/asm/percpu.h| 16 arch/xtensa/include/asm/resource.h | 16 arch/xtensa/include/asm/scatterlist.h | 16 arch/xtensa/include/asm/sections.h | 16 arch/xtensa/include/asm/siginfo.h | 16 arch/xtensa/include/asm/statfs.h| 17 - arch/xtensa/include/asm/topology.h | 16 arch/xtensa/include/asm/xor.h | 16 26 files changed, 25 insertions(+), 244 deletions(-) delete mode 100644 arch/xtensa/include/asm/bitsperlong.h delete mode 100644 arch/xtensa/include/asm/bug.h delete mode 100644 arch/xtensa/include/asm/cputime.h delete mode 100644 arch/xtensa/include/asm/device.h delete mode 100644 arch/xtensa/include/asm/div64.h delete mode 100644 arch/xtensa/include/asm/emergency-restart.h delete mode 100644 arch/xtensa/include/asm/errno.h delete mode 100644 arch/xtensa/include/asm/fcntl.h delete mode 100644 arch/xtensa/include/asm/futex.h delete mode 100644 arch/xtensa/include/asm/hardirq.h delete mode 100644 arch/xtensa/include/asm/ioctl.h delete mode 100644 arch/xtensa/include/asm/irq_regs.h delete mode 100644 arch/xtensa/include/asm/kdebug.h delete mode 100644 arch/xtensa/include/asm/kmap_types.h delete mode 100644 arch/xtensa/include/asm/kvm_para.h delete mode 100644 arch/xtensa/include/asm/local.h delete mode 100644 arch/xtensa/include/asm/local64.h delete mode 100644 arch/xtensa/include/asm/percpu.h delete mode 100644 arch/xtensa/include/asm/resource.h delete mode 100644 arch/xtensa/include/asm/scatterlist.h delete mode 100644 arch/xtensa/include/asm/sections.h delete mode 100644 arch/xtensa/include/asm/siginfo.h delete mode 100644 arch/xtensa/include/asm/statfs.h delete mode 100644 arch/xtensa/include/asm/topology.h delete mode 100644 arch/xtensa/include/asm/xor.h diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild index fccd81e..db2e96a 100644 --- a/arch/xtensa/include/asm/Kbuild +++ b/arch/xtensa/include/asm/Kbuild @@ -1,4 +1,29 @@ include include/asm-generic/Kbuild.asm +generic-y += bitsperlong.h +generic-y += bug.h +generic-y += cputime.h generic-y += clkdev.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += errno.h generic-y += exec.h +generic-y += fcntl.h +generic-y += futex.h +generic-y += hardirq.h +generic-y += ioctl.h +generic-y += irq_regs.h +generic-y += kdebug.h +generic-y += kmap_types.h +generic-y += kvm_para.h +generic-y += local64.h +generic-y += local.h +generic-y += percpu.h +generic-y += resource.h +generic-y += scatterlist.h +generic-y += sections.h +generic-y += siginfo.h +generic-y += statfs.h +generic-y += topology.h +generic-y += xor.h diff --git a/arch/xtensa/include/asm/bitsperlong.h b/arch/xtensa/include/asm/bitsperlong.h deleted file mode 100644 index 6dc0bb0..000 --- a/arch/xtensa/include/asm/bitsperlong.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/xtensa/include/asm/bug.h b/arch/xtensa/include/asm/bug.h deleted file mode 100644 index 3e52d72..000 --- a/arch/xtensa/include/asm/bug.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * include/asm-xtensa/bug.h - * - * Macros to cause a 'bug' message. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for
[PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h
From: Steven Rostedt All the headers but kvm_para.h use the Kbuild infrastructure to get to the asm-generic headers. Cc: linux-kbu...@vger.kernel.org Cc: li...@lists.openrisc.net Cc: Jonas Bonn Signed-off-by: Steven Rostedt --- arch/openrisc/include/asm/Kbuild |1 + arch/openrisc/include/asm/kvm_para.h |1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 arch/openrisc/include/asm/kvm_para.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 7140b6b..d715037 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -34,6 +34,7 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h +generic-y += kvm_para.h generic-y += local.h generic-y += mman.h generic-y += module.h diff --git a/arch/openrisc/include/asm/kvm_para.h b/arch/openrisc/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/openrisc/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 23/25] unicore32: Use Kbuild infrastructure for kvm_para.h
From: Steven Rostedt All the headers but kvm_para.h use the Kbuild infrastructure to get to the asm-generic headers. Cc: linux-kbu...@vger.kernel.org Cc: Guan Xuetao Signed-off-by: Steven Rostedt --- arch/unicore32/include/asm/Kbuild |1 + arch/unicore32/include/asm/kvm_para.h |1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 arch/unicore32/include/asm/kvm_para.h diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild index c910c98..15b47f2 100644 --- a/arch/unicore32/include/asm/Kbuild +++ b/arch/unicore32/include/asm/Kbuild @@ -24,6 +24,7 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h +generic-y += kvm_para.h generic-y += local.h generic-y += mman.h generic-y += module.h diff --git a/arch/unicore32/include/asm/kvm_para.h b/arch/unicore32/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/unicore32/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 03/25] avr32: Use Kbuild infrastructure to handle asm-generic headers
From: Steven Rostedt Use Kbuild infrastructure to handle the asm-generic headers and remove the wrapper headers that call them. This only affects headers that do nothing but include the generic equivalent. It does not touch any header that does a little more. Cc: linux-kbu...@vger.kernel.org Cc: Haavard Skinnemoen Cc: Hans-Christian Egtvedt Signed-off-by: Steven Rostedt --- arch/avr32/include/asm/Kbuild | 27 +++ arch/avr32/include/asm/bitsperlong.h |1 - arch/avr32/include/asm/cputime.h |6 -- arch/avr32/include/asm/delay.h |1 - arch/avr32/include/asm/device.h|7 --- arch/avr32/include/asm/div64.h |6 -- arch/avr32/include/asm/emergency-restart.h |6 -- arch/avr32/include/asm/errno.h |6 -- arch/avr32/include/asm/fcntl.h |6 -- arch/avr32/include/asm/futex.h |6 -- arch/avr32/include/asm/ioctl.h |6 -- arch/avr32/include/asm/ioctls.h|6 -- arch/avr32/include/asm/irq_regs.h |1 - arch/avr32/include/asm/kvm_para.h |1 - arch/avr32/include/asm/local.h |6 -- arch/avr32/include/asm/local64.h |1 - arch/avr32/include/asm/mman.h |1 - arch/avr32/include/asm/percpu.h|6 -- arch/avr32/include/asm/poll.h |1 - arch/avr32/include/asm/resource.h |6 -- arch/avr32/include/asm/scatterlist.h |6 -- arch/avr32/include/asm/sections.h |6 -- arch/avr32/include/asm/siginfo.h |6 -- arch/avr32/include/asm/statfs.h|6 -- arch/avr32/include/asm/topology.h |6 -- arch/avr32/include/asm/xor.h |6 -- arch/cris/include/asm/ipcbuf.h |1 - 27 files changed, 27 insertions(+), 117 deletions(-) delete mode 100644 arch/avr32/include/asm/bitsperlong.h delete mode 100644 arch/avr32/include/asm/cputime.h delete mode 100644 arch/avr32/include/asm/delay.h delete mode 100644 arch/avr32/include/asm/device.h delete mode 100644 arch/avr32/include/asm/div64.h delete mode 100644 arch/avr32/include/asm/emergency-restart.h delete mode 100644 arch/avr32/include/asm/errno.h delete mode 100644 arch/avr32/include/asm/fcntl.h delete mode 100644 arch/avr32/include/asm/futex.h delete mode 100644 arch/avr32/include/asm/ioctl.h delete mode 100644 arch/avr32/include/asm/ioctls.h delete mode 100644 arch/avr32/include/asm/irq_regs.h delete mode 100644 arch/avr32/include/asm/kvm_para.h delete mode 100644 arch/avr32/include/asm/local.h delete mode 100644 arch/avr32/include/asm/local64.h delete mode 100644 arch/avr32/include/asm/mman.h delete mode 100644 arch/avr32/include/asm/percpu.h delete mode 100644 arch/avr32/include/asm/poll.h delete mode 100644 arch/avr32/include/asm/resource.h delete mode 100644 arch/avr32/include/asm/scatterlist.h delete mode 100644 arch/avr32/include/asm/sections.h delete mode 100644 arch/avr32/include/asm/siginfo.h delete mode 100644 arch/avr32/include/asm/statfs.h delete mode 100644 arch/avr32/include/asm/topology.h delete mode 100644 arch/avr32/include/asm/xor.h delete mode 100644 arch/cris/include/asm/ipcbuf.h diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild index be0433e..40573ee 100644 --- a/arch/avr32/include/asm/Kbuild +++ b/arch/avr32/include/asm/Kbuild @@ -4,3 +4,30 @@ generic-y += clkdev.h generic-y += exec.h header-y += cachectl.h + +generic-y += bitsperlong.h +generic-y += cputime.h +generic-y += delay.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += futex.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += irq_regs.h +generic-y += kvm_para.h +generic-y += local64.h +generic-y += local.h +generic-y += mman.h +generic-y += percpu.h +generic-y += poll.h +generic-y += resource.h +generic-y += scatterlist.h +generic-y += sections.h +generic-y += siginfo.h +generic-y += statfs.h +generic-y += topology.h +generic-y += xor.h diff --git a/arch/avr32/include/asm/bitsperlong.h b/arch/avr32/include/asm/bitsperlong.h deleted file mode 100644 index 6dc0bb0..000 --- a/arch/avr32/include/asm/bitsperlong.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/avr32/include/asm/cputime.h b/arch/avr32/include/asm/cputime.h deleted file mode 100644 index e87e0f8..000 --- a/arch/avr32/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_AVR32_CPUTIME_H -#define __ASM_AVR32_CPUTIME_H - -#include - -#endif /* __ASM_AVR32_CPUTIME_H */ diff --git a/arch/avr32/include/asm/delay.h b/arch/avr32/include/asm/delay.h
[PATCH 21/25] tile: Use Kbuild infrastructure for kvm_para.h
From: Steven Rostedt All the headers but kvm_para.h use the Kbuild infrastructure to get to the asm-generic headers. Cc: linux-kbu...@vger.kernel.org Cc: Chris Metcalf Signed-off-by: Steven Rostedt --- arch/tile/include/asm/Kbuild |1 + arch/tile/include/asm/kvm_para.h |1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 arch/tile/include/asm/kvm_para.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 5cd98fa..0296734 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -21,6 +21,7 @@ generic-y += ioctls.h generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h +generic-y += kvm_para.h generic-y += local.h generic-y += msgbuf.h generic-y += mutex.h diff --git a/arch/tile/include/asm/kvm_para.h b/arch/tile/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f..000 --- a/arch/tile/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] (xen) stable/for-linus-3.7-uapi-tag for v3.7-rc0
On Fri, Oct 12, 2012 at 10:45 PM, Konrad Rzeszutek Wilk
wrote:
>
> Please pull!
Btw, please use the -M switch to get renames as renames (and
--summary). You diffstat:
> include/uapi/xen/Kbuild|2 +
> include/uapi/xen/evtchn.h | 88 +++
> include/uapi/xen/privcmd.h | 98
>
> include/xen/Kbuild |2 -
> include/xen/evtchn.h | 88 ---
> include/xen/privcmd.h | 98
>
> 6 files changed, 188 insertions(+), 188 deletions(-)
is misleading, the correct one is much simpler:
include/{ => uapi}/xen/evtchn.h | 0
include/{ => uapi}/xen/privcmd.h | 0
include/xen/Kbuild | 2 --
4 files changed, 2 insertions(+), 2 deletions(-)
rename include/{ => uapi}/xen/evtchn.h (100%)
rename include/{ => uapi}/xen/privcmd.h (100%)
Thanks,
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] PM / Domains: Fix memory leak on error path in pm_genpd_attach_cpuidle
If pm_genpd_attach_cpudidle failed we leak memory stored in 'cpu_data'.
Signed-off-by: Jonghwan Choi
---
drivers/base/power/domain.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index c22b869..96b71b6 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1862,7 +1862,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain
*genpd, int state)
cpuidle_drv = cpuidle_driver_ref();
if (!cpuidle_drv) {
ret = -ENODEV;
- goto out;
+ goto err_drv;
}
if (cpuidle_drv->state_count <= state) {
ret = -EINVAL;
@@ -1884,6 +1884,9 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain
*genpd, int state)
err:
cpuidle_driver_unref();
+
+ err_drv:
+ kfree(cpu_data);
goto out;
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/1] task_work: Add local_irq_enable() into task_work_run()
On Sat, Oct 13, 2012 at 10:09:36AM +0900, Linus Torvalds wrote: > On Sat, Oct 13, 2012 at 1:03 AM, Oleg Nesterov wrote: > > arch/alpha and probably some other architectures call > > do_notify_resume()->task_work_run() with irqs disabled. > > I'm going to ignore this patch because I *hope* it is unnecessary > after the pull from Al that I just did. > > But if that turns out to be not the case, please holler. Torsten, you > seem to be the one who reported this, can you check the current git > tree? For alpha it shouldn't be needed, but it's a good idea in general - it detects bugs of that kind we might very well have on some other architectures, warns about them and attempts to minimize the damage. I think x86, arm, sparc, ppc, s390, x86, mips and m68k are OK, judging by the local testing I've done (alpha did trigger that mess during the same testing, until I'd added those patches). As for everything else... no idea at the moment. Unfortunately, TFS to read through for that includes an unhealthy amount of asm glue on all sorts of strange architectures ;-/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/1] task_work: Add local_irq_enable() into task_work_run()
On Sat, Oct 13, 2012 at 1:03 AM, Oleg Nesterov wrote: > arch/alpha and probably some other architectures call > do_notify_resume()->task_work_run() with irqs disabled. I'm going to ignore this patch because I *hope* it is unnecessary after the pull from Al that I just did. But if that turns out to be not the case, please holler. Torsten, you seem to be the one who reported this, can you check the current git tree? Thanks, Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
CONFIG_MODULE_SIG breaks out-of-tree modules in modpost.
For starters, yes, I *do* understand the security issues involved, and no, I *don't* want to hear about NVidia evilness, because this looks like a modpost problem not an NVidia problem. I built next-20121011 with CONFIG_MODULE_SIG=y, and MODULE_SIG_FORCE=n, so that I could test the feature, and just accept that the nvidia module was going to hand me 2 taints instead of one. But then, building the NVidia module a wondrous thing happened, and it threw a most inexplicable error: cp /usr/src/valdis/NVIDIA-Linux-x86_64-304.51/kernel/nvidia.ko.unsigned /usr/src/valdis/NVIDIA-Linux-x86_64-304.51/kernel/nvidia.ko.stripped && strip -x -g /usr/src/valdis/NVIDIA-Linux-x86_64-304.51/kernel/nvidia.ko.stripped && /usr/bin/eu-strip /usr/src/valdis/NVIDIA-Linux-x86_64-304.51/kernel/nvidia.ko.stripped /bin/sh: -c: line 0: syntax error near unexpected token `;' /bin/sh: -c: line 0: `set -e; ; echo 'cmd_/usr/src/valdis/NVIDIA-Linux-x86_64-304.51/kernel/nvidia.ko := ' > /usr/src/valdis/NVIDIA-Linux-x86_64-304.51/kernel/.nvidia.ko.cmd' Looks like somebody left a $(FOO) unset between the 2 ';' characters. I wasn't able to follow the way scripts/Makefile.modpost worked well enough to figure out where that line gets built, there's way too many 'set -e' in the scripts/ tree. Building with MODULE_SIG=n made it build just fine. This *MAY* be related to this RedHat bug: https://bugzilla.redhat.com/show_bug.cgi?id=655231 pgpaqzRNRqUKg.pgp Description: PGP signature
[PATCH] sdhci: put regulator if probe fails
When using the dummy regulator, SDHCI may fail its probing because the
regulator does not support any voltages.
When reloading the driver, you will get a warning about a duplicate
sysfs link.
[72211.963386] :03:00.0 supply vmmc not found, using dummy regulator
[72211.963409] [ cut here ]
[72211.963420] WARNING: at fs/sysfs/dir.c:536 sysfs_add_one+0x99/0xad()
[72211.963424] Hardware name:
[72211.963429] sysfs: cannot create duplicate filename
'/devices/platform/reg-dummy/regulator/regulator.0/:03:00.0-vmmc'
Avoid this by properly cleaning up when the probe fails calling
regulator_put. Other fail paths get fixed as well.
Signed-off-by: Thadeu Lima de Souza Cascardo
---
drivers/mmc/host/sdhci.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 7922adb..dd6bc26 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2992,7 +2992,8 @@ int sdhci_add_host(struct sdhci_host *host)
if (mmc->ocr_avail == 0) {
pr_err("%s: Hardware doesn't report any "
"support voltages.\n", mmc_hostname(mmc));
- return -ENODEV;
+ ret = -ENODEV;
+ goto out_vmmc;
}
spin_lock_init(>lock);
@@ -3121,6 +3122,9 @@ reset:
untasklet:
tasklet_kill(>card_tasklet);
tasklet_kill(>finish_tasklet);
+out_vmmc:
+ if (host->vmmc)
+ regulator_put(host->vmmc);
return ret;
}
--
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[git pull] signals pile 3
The last bits of infrastructure for kernel_thread() et.al., with alpha/arm/x86 use of those. Plus sanitizing the asm glue and do_notify_resume() on alpha, fixing the "disabled irq while running task_work stuff" breakage there. At that point the rest of kernel_thread/kernel_execve/sys_execve work can be done independently for different architectures. The only pending bits that do depend on having all architectures converted are restrictred to fs/* and kernel/* - that'll obviously have to wait for the next cycle. I thought we'd have to wait for all of them done before we start eliminating the longjump-style insanity in kernel_execve(), but it turned out there's a very simple way to do that without flagday-style changes. Please, pull from git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal for-linus Shortlog: Al Viro (12): alpha: simplify TIF_NEED_RESCHED handling alpha: take SIGPENDING/NOTIFY_RESUME loop into signal.c alpha: don't bother passing switch_stack separately from regs alpha: get rid of switch_stack argument of do_work_pending() don't bother with kernel_thread/kernel_execve for launching linuxrc ppc: eeh_event should just use kthread_run() make sure that we always have a return path from kernel_execve() make sure that kernel_thread() callbacks call do_exit() themselves infrastructure for saner ret_from_kernel_thread semantics x86, um: convert to saner kernel_execve() semantics arm: switch to saner kernel_execve() semantics alpha: switch to saner kernel_execve() semantics Diffstat: arch/Kconfig |3 + arch/alpha/Kconfig |1 + arch/alpha/include/asm/unistd.h|1 - arch/alpha/kernel/entry.S | 87 +--- arch/alpha/kernel/signal.c | 48 +-- arch/arm/Kconfig |1 + arch/arm/include/asm/unistd.h |1 - arch/arm/kernel/entry-common.S | 29 + arch/arm/kernel/process.c |5 +- arch/powerpc/platforms/pseries/eeh_event.c |5 +- arch/um/include/asm/processor-generic.h|2 - arch/um/include/shared/os.h|1 - arch/um/kernel/exec.c |5 -- arch/um/kernel/process.c | 10 +-- arch/um/os-Linux/process.c | 13 arch/x86/Kconfig |1 + arch/x86/include/asm/unistd.h |1 - arch/x86/kernel/entry_32.S | 31 -- arch/x86/kernel/entry_64.S | 24 +-- arch/x86/um/Kconfig|1 + include/linux/syscalls.h |8 +++ init/do_mounts_initrd.c| 41 + init/main.c| 33 ++- kernel/kmod.c |7 ++- kernel/kthread.c |1 + 25 files changed, 137 insertions(+), 223 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ACPI video: Ignore errors after _DOD evaluation.
There are systems where video module known to work fine regardless
of broken _DOD and ignoring returned value here doesn't cause
any issues later. This should fix brightness controls on some laptops.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=47861
Signed-off-by: Igor Murzov
Reviewed-by: Sergey V
---
Previous discussion of the issue:
http://thread.gmane.org/gmane.linux.acpi.devel/56345
drivers/acpi/video.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index f94d4c8..0230cb6 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1345,12 +1345,15 @@ static int
acpi_video_bus_get_devices(struct acpi_video_bus *video,
struct acpi_device *device)
{
- int status;
+ int status = 0;
struct acpi_device *dev;
- status = acpi_video_device_enumerate(video);
- if (status)
- return status;
+ /*
+* There are systems where video module known to work fine regardless
+* of broken _DOD and ignoring returned value here doesn't cause
+* any issues later.
+*/
+ acpi_video_device_enumerate(video);
list_for_each_entry(dev, >children, node) {
--
1.7.12.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[git pull] vfs pile 3
Stuff from Jeff Layton, mostly. Sanitizing interplay between audit and namei, removing a lot of insanity from audit_inode() mess and getting things ready for his ESTALE patchset. Please, pull from the usual place - git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus Shortlog: Eric Paris (1): audit: make audit_compare_dname_path use parent_len helper Jeff Layton (19): audit: remove unnecessary NULL ptr checks from do_path_lookup audit: pass in dentry to audit_copy_inode wherever possible audit: no need to walk list in audit_inode if name is NULL audit: reverse arguments to audit_inode_child audit: add a new "type" field to audit_names struct audit: set the name_len in audit_inode for parent lookups audit: remove dirlen argument to audit_compare_dname_path audit: optimize audit_compare_dname_path audit: overhaul __audit_inode_child to accomodate retrying vfs: allocate page instead of names_cache buffer in mount_block_root acct: constify the name arg to acct_on vfs: unexport getname and putname symbols vfs: define struct filename and have getname() return it audit: allow audit code to satisfy getname requests from its names_list vfs: turn do_path_lookup into wrapper around struct filename variant vfs: make path_openat take a struct filename pointer audit: make audit_inode take struct filename vfs: embed struct filename inside of names_cache allocation if possible procfs: don't need a PATH_MAX allocation to hold a string representation of an int Diffstat: arch/alpha/kernel/osf_sys.c | 16 +- arch/arm64/kernel/sys.c |4 +- arch/arm64/kernel/sys_compat.c |6 +- arch/avr32/kernel/process.c |4 +- arch/blackfin/kernel/process.c |4 +- arch/cris/arch-v10/kernel/process.c |4 +- arch/cris/arch-v32/kernel/process.c |4 +- arch/h8300/kernel/process.c |4 +- arch/hexagon/kernel/syscall.c |4 +- arch/ia64/kernel/process.c |4 +- arch/m32r/kernel/process.c |4 +- arch/microblaze/kernel/sys_microblaze.c |4 +- arch/mips/kernel/linux32.c |4 +- arch/mips/kernel/syscall.c |4 +- arch/openrisc/kernel/process.c |4 +- arch/parisc/hpux/fs.c |4 +- arch/parisc/kernel/process.c|4 +- arch/parisc/kernel/sys_parisc32.c |4 +- arch/score/kernel/sys_score.c |4 +- arch/sh/kernel/process_32.c |4 +- arch/sh/kernel/process_64.c |4 +- arch/sparc/kernel/process_32.c |4 +- arch/sparc/kernel/process_64.c |4 +- arch/sparc/kernel/sys_sparc32.c |4 +- arch/tile/kernel/process.c |8 +- arch/unicore32/kernel/sys.c |4 +- arch/xtensa/kernel/process.c|4 +- fs/btrfs/ioctl.c|2 +- fs/compat.c | 12 +- fs/exec.c | 14 +- fs/filesystems.c|4 +- fs/internal.h |4 +- fs/namei.c | 213 -- fs/namespace.c |4 +- fs/open.c | 29 - fs/proc/base.c |5 +- fs/quota/quota.c|4 +- fs/xattr.c |8 +- include/linux/audit.h | 69 +++--- include/linux/fs.h | 21 +++- include/linux/fsnotify.h|8 +- init/do_mounts.c|7 +- ipc/mqueue.c| 17 ++- kernel/acct.c |6 +- kernel/audit.h |7 +- kernel/audit_watch.c|3 +- kernel/auditfilter.c| 65 ++ kernel/auditsc.c| 217 +-- mm/swapfile.c | 11 +- 49 files changed, 544 insertions(+), 312 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/2] uapi: remove trailing spaces
From: "Luis R. Rodriguez"
No functional changes.
Cc: dri-de...@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Cc: de...@driverdev.osuosl.org
Cc: backpo...@vger.kernel.org
Cc: Rob Clark
Cc: Arnd Bergmann
Cc: Dave Jones
Cc: David Airlie
Cc: Ben Skeggs
Cc: Alan Cox
Cc: David Howells
Cc: Thomas Gleixner
Cc: Daniel Vetter
Cc: Jesse Barnes
Cc: Alex Deucher
Cc: Paul E. McKenney
Cc: Greg Kroah-Hartman
Cc: Laurent Pinchart
Signed-off-by: Luis R. Rodriguez
---
include/uapi/asm-generic/siginfo.h |4 ++--
include/uapi/asm-generic/statfs.h |4 ++--
include/uapi/drm/radeon_drm.h |2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/uapi/asm-generic/siginfo.h
b/include/uapi/asm-generic/siginfo.h
index ba5be7f..34b941ce6 100644
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -252,8 +252,8 @@ typedef struct siginfo {
/*
* sigevent definitions
- *
- * It seems likely that SIGEV_THREAD will have to be handled from
+ *
+ * It seems likely that SIGEV_THREAD will have to be handled from
* userspace, libpthread transmuting it to SIGEV_SIGNAL, which the
* thread manager then catches and does the appropriate nonsense.
* However, everything is written out here so as to not get lost.
diff --git a/include/uapi/asm-generic/statfs.h
b/include/uapi/asm-generic/statfs.h
index 0999647..0d79b2f 100644
--- a/include/uapi/asm-generic/statfs.h
+++ b/include/uapi/asm-generic/statfs.h
@@ -36,7 +36,7 @@ struct statfs {
/*
* ARM needs to avoid the 32-bit padding at the end, for consistency
- * between EABI and OABI
+ * between EABI and OABI
*/
#ifndef ARCH_PACK_STATFS64
#define ARCH_PACK_STATFS64
@@ -57,7 +57,7 @@ struct statfs64 {
__statfs_word f_spare[4];
} ARCH_PACK_STATFS64;
-/*
+/*
* IA64 and x86_64 need to avoid the 32-bit padding at the end,
* to be compatible with the i386 ABI
*/
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h
index 4766c0f..48b0db3 100644
--- a/include/uapi/drm/radeon_drm.h
+++ b/include/uapi/drm/radeon_drm.h
@@ -229,7 +229,7 @@ typedef union {
# define R300_WAIT_3D 0x2
/* these two defines are DOING IT WRONG - however
* we have userspace which relies on using these.
- * The wait interface is backwards compat new
+ * The wait interface is backwards compat new
* code should use the NEW_WAIT defines below
* THESE ARE NOT BIT FIELDS
*/
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/2] uapi: update includes for drm content when no kernel API exists
From: "Luis R. Rodriguez"
The UAPI changes split kernel API and userspace API
content onto two separate header files. The userspace
API drm content was moved to include/uapi/drm/ with the
same file name while kernel specific API content was
kept under include/drm/ with the same file name. When
one file was split into two files the kernel header
includes the uapi header and a UAPI prefix was added to
the uapi header for its header guard. When there was no
kernel API content found the uapi header file was the
only one that was kept and the original guard for the
header file was kept. In this particular case the
original users of this header file were not modified
and the uapi header file is expected to be picked up
by path.
This may work well at compilation on the kernel but when
backporting this creates a few complexities. To help with
backporting [0] lets be explicit about the new uapi path
when there is no respective kernel API header file. For
more details on the UAPI changes see the lwn article on
this [1].
[0] https://backports.wiki.kernel.org
[1] http://lwn.net/Articles/507794/
Cc: dri-de...@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Cc: de...@driverdev.osuosl.org
Cc: backpo...@vger.kernel.org
Cc: Rob Clark
Cc: Arnd Bergmann
Cc: Dave Jones
Cc: David Airlie
Cc: Ben Skeggs
Cc: Alan Cox
Cc: David Howells
Cc: Thomas Gleixner
Cc: Daniel Vetter
Cc: Jesse Barnes
Cc: Alex Deucher
Cc: Paul E. McKenney
Cc: Greg Kroah-Hartman
Cc: Laurent Pinchart
Signed-off-by: Luis R. Rodriguez
---
drivers/gpu/drm/drm_crtc.c|2 +-
drivers/gpu/drm/nouveau/nv04_cursor.c |2 +-
drivers/staging/omapdrm/omap_crtc.c |2 +-
include/drm/drmP.h|4 ++--
include/drm/drm_crtc.h|4 ++--
include/uapi/drm/drm.h|2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index ef1b221..6486e89 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -35,7 +35,7 @@
#include
#include
#include
-#include
+#include
/* Avoid boilerplate. I'm tired of typing. */
#define DRM_ENUM_NAME_FN(fnname, list) \
diff --git a/drivers/gpu/drm/nouveau/nv04_cursor.c
b/drivers/gpu/drm/nouveau/nv04_cursor.c
index fe86f0d..7af590f 100644
--- a/drivers/gpu/drm/nouveau/nv04_cursor.c
+++ b/drivers/gpu/drm/nouveau/nv04_cursor.c
@@ -1,5 +1,5 @@
#include
-#include
+#include
#include "nouveau_drm.h"
#include "nouveau_reg.h"
#include "nouveau_crtc.h"
diff --git a/drivers/staging/omapdrm/omap_crtc.c
b/drivers/staging/omapdrm/omap_crtc.c
index 732f2ad..029c9ec 100644
--- a/drivers/staging/omapdrm/omap_crtc.c
+++ b/drivers/staging/omapdrm/omap_crtc.c
@@ -19,7 +19,7 @@
#include "omap_drv.h"
-#include "drm_mode.h"
+#include
#include "drm_crtc.h"
#include "drm_crtc_helper.h"
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 3fd8280..9030369 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -72,8 +72,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 3fa18b7..1012503 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -30,9 +30,9 @@
#include
#include
#include
-#include
-#include
+#include
+#include
struct drm_device;
struct drm_mode_set;
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index 1e3481e..51ee504 100644
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -628,7 +628,7 @@ struct drm_prime_handle {
__s32 fd;
};
-#include
+#include
#define DRM_IOCTL_BASE 'd'
#define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr)
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 0/2] uapi: two minor changes
From: "Luis R. Rodriguez" Here are a few minor updates to the UAPI changes [0]. The first one is to help with the backport effort [1], the second one is simply space cosmetic change to address my eyes bleeding while reviewing the changes on next-20121012 with git. If the changes on the first patch make sense perhaps similar changes can be done for the other subsystem in similar cases. In those cases the now kernel API header file no longer exists so even if userspace were using the files the only way to pick the header up would have been to provide the new uapi path. [0] http://lwn.net/Articles/507794/ [1] https://backports.wiki.kernel.org Luis R. Rodriguez (2): uapi: update includes for drm content when no kernel API exists uapi: remove trailing spaces drivers/gpu/drm/drm_crtc.c|2 +- drivers/gpu/drm/nouveau/nv04_cursor.c |2 +- drivers/staging/omapdrm/omap_crtc.c |2 +- include/drm/drmP.h|4 ++-- include/drm/drm_crtc.h|4 ++-- include/uapi/asm-generic/siginfo.h|4 ++-- include/uapi/asm-generic/statfs.h |4 ++-- include/uapi/drm/drm.h|2 +- include/uapi/drm/radeon_drm.h |2 +- 9 files changed, 13 insertions(+), 13 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] Disintegrate UAPI for spi
On Sat, Oct 13, 2012 at 12:06 AM, David Howells wrote: > Grant Likely wrote: > >> > Can you merge the following branch into the spi tree please. >> >> Do you want this merged into 3.7? If so, go ahead and push it directly >> to Linus. I've not been able to do any maintainership stuff for the >> last merge window or this one. Mark Brown has covered for me on SPI. > > Could I get an Ack for it? Acked-by: Grant Likely -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/1] Tools: hv: Don't return loopback addresses
Don't return loopback addresses and further don't terminate
the IP address strings with a semicolon. This is the current
behavior of Windows guests.
Signed-off-by: K. Y. Srinivasan
Reviewed-by: Haiyang Zhang
Reported-by: Claudio Latini
---
tools/hv/hv_kvp_daemon.c | 13 +
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 6c7bcb9..13c2a14 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
/*
* KVP protocol: The user mode component first registers with the
@@ -882,7 +883,7 @@ static int kvp_process_ip_address(void *addrp,
addr_length = INET6_ADDRSTRLEN;
}
- if ((length - *offset) < addr_length + 1)
+ if ((length - *offset) < addr_length + 2)
return HV_E_FAIL;
if (str == NULL) {
strcpy(buffer, "inet_ntop failed\n");
@@ -890,11 +891,13 @@ static int kvp_process_ip_address(void *addrp,
}
if (*offset == 0)
strcpy(buffer, tmp);
- else
+ else {
+ strcat(buffer, ";");
strcat(buffer, tmp);
- strcat(buffer, ";");
+ }
*offset += strlen(str) + 1;
+
return 0;
}
@@ -956,7 +959,9 @@ kvp_get_ip_info(int family, char *if_name, int op,
* supported address families; if not we gather info on
* the specified address family.
*/
- if ((family != 0) && (curp->ifa_addr->sa_family != family)) {
+ if family != 0) &&
+(curp->ifa_addr->sa_family != family))) ||
+(curp->ifa_flags & IFF_LOOPBACK)) {
curp = curp->ifa_next;
continue;
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/1] tools: hv: Return the full kernel version
Currently, we are returning the same string for both OSBuildNumber and OSVersion keys. Return the full uts string for the OSBuild key since Windows does not impose any restrictions on this. Signed-off-by: K. Y. Srinivasan Reviewed-by: Haiyang Zhang Reported-by: Claudio Latini --- tools/hv/hv_kvp_daemon.c |9 ++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index 5959aff..6c7bcb9 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -88,6 +88,7 @@ static char *os_major = ""; static char *os_minor = ""; static char *processor_arch; static char *os_build; +static char *os_version; static char *lic_version = "Unknown version"; static struct utsname uts_buf; @@ -453,7 +454,9 @@ void kvp_get_os_info(void) char*p, buf[512]; uname(_buf); - os_build = uts_buf.release; + os_version = uts_buf.release; + os_build = strdup(uts_buf.release); + os_name = uts_buf.sysname; processor_arch = uts_buf.machine; @@ -462,7 +465,7 @@ void kvp_get_os_info(void) * string to be of the form: x.y.z * Strip additional information we may have. */ - p = strchr(os_build, '-'); + p = strchr(os_version, '-'); if (p) *p = '\0'; @@ -1649,7 +1652,7 @@ int main(void) strcpy(key_name, "OSMinorVersion"); break; case OSVersion: - strcpy(key_value, os_build); + strcpy(key_value, os_version); strcpy(key_name, "OSVersion"); break; case ProcessorArchitecture: -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH RFC 2/2] [x86] Optimize copy_page by re-arranging instruction sequence and saving register
On Fri, Oct 12, 2012 at 05:02:57PM -0400, George Spelvin wrote: > Here are some Phenom results for that benchmark. The average time > increases from 700 to 760 cycles (+8.6%). I was afraid something like that would show up. Btw, in looking at this more and IINM, we use the REP MOVSQ version on AMD anyway because of X86_FEATURE_REP_GOOD being set on some K8 and everything from F10h on. So, actually this µbenchmark should be comparing the REP MOVSQ case too and the changes to the unrolled copy_page shouldn't concern AMD boxes actually... Hmm. -- Regards/Gruss, Boris. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] Disintegrate UAPI for spi
Grant Likely wrote: > > Can you merge the following branch into the spi tree please. > > Do you want this merged into 3.7? If so, go ahead and push it directly > to Linus. I've not been able to do any maintainership stuff for the > last merge window or this one. Mark Brown has covered for me on SPI. Could I get an Ack for it? David -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [dm-crypt] PROBLEM: read starvation during writeback
Hi, On Fri, 2012-10-12 at 22:34 +0200, Milan Broz wrote: > On 10/12/2012 09:37 PM, Michael Zugelder wrote: > > Testing setup: > > * Fedora 17, stock 3.5.4-2.fc17 kernel and a self-compiled 3.6.1 kernel > > * 320 GiB USB hard drive (sdb) > > I guess that USB is the key factor here... I remember to have similar > problem some time ago even without dmcrypt. > > Is it reproducible with the same kernel cfg but with internal disk? I noticed this problem on my encrypted root partition and used the USB device to reproduce it. It's just much easier to get writeback on a simple 20 MiB/s device and being able to actually use the root device while performing tests. My root device (SATA2, Samsung SSD 830, aes-xts-plain, btrfs): 3463 seeks/second, 0.29 ms random access time During writeback: 0 seeks/second, 4285.71 ms random access time > You can also test completely fake underlying device, > use device-mapper- zero target: > dmsetup create dev_zero --table "0 zero" > (All writes are dropped and all reads returns zero in this case.) > > Is there any starvation with this setup? (It shouldn't.) Using the zero target alone, no issues (192286 seeks/second). > Btw you can use cryptsetup with cipher "null" to simplify > (I added to cryptsetup to test exactly such scenarios). Neat, but doesn't work with the device mapper null target. Using raw dmsetup with crypto_null results in a nice test case: Preparation: # dmsetup create dev_zero --table "0 $((1024*1024*1024)) zero" # dmsetup create nullcrypt --table "0 $((1024*1024*1024)) crypt cipher_null - 0 /dev/mapper/dev_zero 0" Now some writes: # dd if=/dev/zero of=/dev/mapper/nullcrypt bs=1M Then try to read something: # seeker /dev/mapper/nullcrypt 8260 seeks/second, 0.12 ms random access time # dd if=/dev/mapper/nullcrypt of=/dev/null count=1 skip=355154 512 bytes (512 B) copied, 18.0695 s, 0.0 kB/s For some time period, reads are fine (see the relatively low average random access time), but sometimes reads take multiple seconds. A benchmark showing min/max/avg/med/stdev values for random reads would be nice. > > * writeback induced by running 'dd if=/dev/zero of=$target bs=1M' > > Any change if you use oflag=direct ? (iow using direct io) No issues while using direct IO (25054 seeks/second, no obvious spikes) using the null target, cipher_null test from above. > > I experimented a bit with the other device mapper targets, namely linear > > and stripe, but both worked completely fine. I also tried putting a > > linear mapping above dm-crypt, with no impact on performance. Comparing > > the content of the /sys/block/$DEV files of the linear mapping and > > dm-crypt, there are no differences beside the name, dev no, stats, > > uevent and inflight files. > > There is crucial difference between linear/stripe and dmcrypt: > linear just remaps IO target device, dmcrypt queues operations > (using kernel workqueue) and creates full bio clones. > So comparison here is IMHO not much helpful. Okay, I just wanted to rule out a general device mapper problem. > There are two internal dmcrypt queues, but I think that the problem > is triggered by some combination with USB storage backend. Results above seem to indicate otherwise. > > Any pointers would be appreciated, I haven't found much on the web about > > this issue. > > Btw there was a proposed rewrite of internal dmcrypt queues, if you have time, > you can try if it changes anything for your use case. > Patches in dm-devel archive > http://www.redhat.com/archives/dm-devel/2012-August/msg00210.html Seems interesting, I'll try it out tomorrow. Thanks, Michael -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[git pull] 3.7 device-mapper changes
Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm tags/dm-3.7-changes to get the following device-mapper changes for 3.7. Thanks, Alasdair Remove the power-of-2 block size constraint on discards in dm thin provisioning and factor the bio_prison code out into a separate module (for sharing with the forthcoming cache target). Use struct bio's front_pad to eliminate the use of one separate mempool by bio-based devices. A few other tiny clean-ups. Mike Snitzer (3): dm thin: support discard with non power of two block size dm thin: prepare to separate bio_prison code dm thin: move bio_prison code to separate module Mikulas Patocka (2): dm: use ACCESS_ONCE for sysfs values dm: store dm_target_io in bio front_pad Wei Yongjun (3): dm mpath: fix check for null mpio in end_io fn dm bufio: use list_move dm persistent data: convert to use le32_add_cpu drivers/md/Kconfig |8 + drivers/md/Makefile |1 + drivers/md/dm-bio-prison.c | 415 + drivers/md/dm-bio-prison.h | 72 +++ drivers/md/dm-bufio.c| 13 +- drivers/md/dm-mpath.c|3 +- drivers/md/dm-thin.c | 521 -- drivers/md/dm-verity.c |2 +- drivers/md/dm.c | 108 ++--- drivers/md/persistent-data/dm-space-map-common.c |4 +- 10 files changed, 636 insertions(+), 511 deletions(-) create mode 100644 drivers/md/dm-bio-prison.c create mode 100644 drivers/md/dm-bio-prison.h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] Disintegrate UAPI for spi
On Tue, Oct 9, 2012 at 2:30 PM, David Howells wrote:
> Can you merge the following branch into the spi tree please.
Do you want this merged into 3.7? If so, go ahead and push it directly
to Linus. I've not been able to do any maintainership stuff for the
last merge window or this one. Mark Brown has covered for me on SPI.
g.
> This is to complete part of the Userspace API (UAPI) disintegration for which
> the preparatory patches were pulled recently. After these patches, userspace
> headers will be segregated into:
>
> include/uapi/linux/.../foo.h
>
> for the userspace interface stuff, and:
>
> include/linux/.../foo.h
>
> for the strictly kernel internal stuff.
>
> ---
> The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
>
> Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900)
>
> are available in the git repository at:
>
>
> git://git.infradead.org/users/dhowells/linux-headers.git
> tags/disintegrate-spi-20121009
>
> for you to fetch changes up to 7939d3c2a677b06cf111a1304710dd97892f3695:
>
> UAPI: (Scripted) Disintegrate include/linux/spi (2012-10-09 09:49:03 +0100)
>
>
> UAPI Disintegration 2012-10-09
>
>
> David Howells (1):
> UAPI: (Scripted) Disintegrate include/linux/spi
>
> include/linux/spi/Kbuild | 1 -
> include/uapi/linux/spi/Kbuild | 1 +
> include/{ => uapi}/linux/spi/spidev.h | 0
> 3 files changed, 1 insertion(+), 1 deletion(-)
> rename include/{ => uapi}/linux/spi/spidev.h (100%)
> .
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [Xen-devel] [PATCH V2 3/7]: PVH: mmu related changes.
On Fri, 12 Oct 2012 09:57:56 +0100
Ian Campbell wrote:
> On Thu, 2012-10-11 at 22:58 +0100, Mukesh Rathor wrote:
> > @@ -2177,8 +2210,19 @@ static const struct pv_mmu_ops xen_mmu_ops
> > __initconst = {
> >
> > void __init xen_init_mmu_ops(void)
> > {
> > - x86_init.mapping.pagetable_reserve =
> > xen_mapping_pagetable_reserve; x86_init.paging.pagetable_init =
> > xen_pagetable_init; +
> > + if (xen_feature(XENFEAT_auto_translated_physmap)) {
> > + pv_mmu_ops.flush_tlb_others = xen_flush_tlb_others;
> > +
> > + /* For PCI devices to map iomem. */
> > + if (xen_initial_domain()) {
> > + pv_mmu_ops.set_pte = native_set_pte;
> > + pv_mmu_ops.set_pte_at = native_set_pte_at;
>
> What do these end up being for the !xen_initial_domain case? I'd have
> expected native_FOO.
Yeah, right, we kept on changing the functions that they were set
to, until it came down to just native_*. I just didn't think it didnt
being set. Too much too fast... ok, time to slow down... :) :)..
thanks
Mukesh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/3] vmevent: Factor vmevent_match_attr() out of vmevent_match()
On Fri, Oct 12, 2012 at 03:37:43PM +0300, Pekka Enberg wrote:
[...]
> > +static bool vmevent_match_attr(struct vmevent_attr *attr, u64 value)
> > +{
> > + u32 state = attr->state;
> > + bool attr_lt = state & VMEVENT_ATTR_STATE_VALUE_LT;
> > + bool attr_gt = state & VMEVENT_ATTR_STATE_VALUE_GT;
> > + bool attr_eq = state & VMEVENT_ATTR_STATE_VALUE_EQ;
> > + bool edge = state & VMEVENT_ATTR_STATE_EDGE_TRIGGER;
> > + u32 was_lt_mask = VMEVENT_ATTR_STATE_VALUE_WAS_LT;
> > + u32 was_gt_mask = VMEVENT_ATTR_STATE_VALUE_WAS_GT;
> > + bool lt = value < attr->value;
> > + bool gt = value > attr->value;
> > + bool eq = value == attr->value;
> > + bool was_lt = state & was_lt_mask;
> > + bool was_gt = state & was_gt_mask;
>
> [snip]
>
> So I merged this patch but vmevent_match_attr() is still too ugly for
> words. It really could use some serious cleanups.
Thanks a lot for merging these cleanups!
Yes, the patch wasn't meant to simplify the matching logic, but just to
let us use the function in other places.
I once started converting the function into table-based approach, but the
code started growing, and I abandoned the idea for now. I might resume the
work just for the fun of it, but the code will be larger than this ad-hoc
function, althouh surely it will be more generic and understandable.
But let's solve primary problems with the vmevent first. :-)
Thanks,
Anton.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] Final round of SCSI updates for the 3.6+ merge window
This is an assorted set of stragglers into the merge window with driver updates for megaraid_sas, lpfc, bfi and mvumi. It also includes some fairly major fixes for virtio-scsi (scatterlist init), scsi_debug (off by one error), storvsc (use after free) and qla2xxx (potential deadlock). The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc The short changelog is Adam Radford (7): megaraid_sas: Version, Changelog, Copyright update megaraid_sas: Remove duplicate code megaraid_sas: Add SystemPD FastPath support megaraid_sas: Add array boundary check for SystemPD megaraid_sas: Load io_request DataLength in bytes megaraid_sas: Add module param for configurable MSI-X vector count megaraid_sas: Remove un-needed completion_lock spinlock calls James Smart (16): lpfc 8.3.35: Update lpfc version for 8.3.35 driver release lpfc 8.3.35: Fixed not reporting logical link speed to SCSI midlayer when QoS not on lpfc 8.3.35: Fix error with fabric service parameters causing performance issues lpfc 8.3.35: Fixed SCSI host create showing wrong link speed on SLI3 HBA ports lpfc 8.3.35: Fixed not checking solicition in progress bit when verifying FCF record for use lpfc 8.3.35: Fixed messages for misconfigured port errors lpfc 8.3.35: Fixed kernel warning on spinlock usage on some distributions lpfc 8.3.35: Fixed PRLI not being retried if a LS_RJT with a reason lpfc 8.3.35: Correct request_firmware use that was increasing boot times lpfc 8.3.35: Fix FCP2 Retries for non-r/w commands. lpfc 8.3.35: Fixed Linux generic firmware download on SLI4 devices with longer module names lpfc 8.3.35: Expand I/O channel support for large systems lpfc 8.3.35: Correct missing queue destroy on function reset lpfc 8.3.35: Fix incorrect comment in T10 DIF attributes lpfc 8.3.35: Added checking BMBX register for RDY bit before writing the first address in lpfc 8.3.35: Fix interrupt delay multipler conversion for eq_create Jiri Kosina (1): qla2xxx: fix potential deadlock on ha->hardware_lock K. Y. Srinivasan (1): storvsc: Account for in-transit packets in the RESET path Krishna Gudipati (15): bfa: Update the driver version to 3.1.2.1 bfa: Firmware image naming convention update bfa: Add support to read/update the FRU data. bfa: Support Power on Hours display and diag temp sensor fixes bfa: Add support to configure min/max bandwidth for a pcifn bfa: Add support for IO throttling at port level bfa: Add support for user to configure bandwidth on QoS priorities bfa: Fabric Assigned Address implementation fix bfa: Add diagnostic port (D-Port) support bfa: Fix to handle firmware tskim abort request response bfa: Fix few attributes in the RHBA CT passthru command bfa: Add support to have mfg date as part of adapter attributes bfa: Flash Controller PLL initialization fixes bfa: IOCFC state machine enhancements bfa: Add support for FC Arbitrated Loop topology. Li Zhong (1): Shorten the path length of scsi_cmd_to_driver() Lukas Czerner (1): scsi_debug: Fix off-by-one bug when unmapping region Neerav Parikh (1): fcoe: Fix write errors on NPIV ports Paolo Bonzini (2): virtio-scsi: support online resizing of disks virtio-scsi: fix LUNs greater than 255 Richard W.M. Jones (1): virtio-scsi: initialize scatterlist structure Robert Love (1): Documentation: Add lesb/ to path for LESB attributes in FCoE bus documentation Shun Fu (1): mvumi: Add support for Marvell SAS/SATA RAID-on-Chip(ROC) 88RC9580 Yi Zou (1): libfc: fix lun reset failure bugs in fc_fcp_resp handling of FCP_RSP_INFO And the diffstat Documentation/ABI/testing/sysfs-bus-fcoe| 12 +- Documentation/scsi/ChangeLog.megaraid_sas | 13 + drivers/scsi/bfa/bfa_core.c | 85 ++- drivers/scsi/bfa/bfa_defs.h | 61 +- drivers/scsi/bfa/bfa_defs_svc.h | 119 ++- drivers/scsi/bfa/bfa_fc.h |5 + drivers/scsi/bfa/bfa_fcbuild.c |4 + drivers/scsi/bfa/bfa_fcpim.c| 123 ++- drivers/scsi/bfa/bfa_fcpim.h| 13 +- drivers/scsi/bfa/bfa_fcs.c | 64 +- drivers/scsi/bfa/bfa_fcs.h | 23 +- drivers/scsi/bfa/bfa_fcs_lport.c| 155 +++- drivers/scsi/bfa/bfa_fcs_rport.c| 288 ++- drivers/scsi/bfa/bfa_ioc.c | 494 +++- drivers/scsi/bfa/bfa_ioc.h | 63 +- drivers/scsi/bfa/bfa_ioc_ct.c | 236 +++--- drivers/scsi/bfa/bfa_modules.h |1 + drivers/scsi/bfa/bfa_port.c | 32 + drivers/scsi/bfa/bfa_port.h |3 + drivers/scsi/bfa/bfa_svc.c | 732 +-
Re: [PATCH 0/1] (Was: [regression] boot failure on alpha, bisected)
On Fri, Oct 12, 2012 at 06:03:37PM +0200, Oleg Nesterov wrote: > On 10/06, Thorsten Kranzkowski wrote: > > > > After upgrading from v3.5-rc7 to current git my system oopses and locks up > > early in the boot sequence. > > OK, I am sending the patch which I already showed. > > Perhaps we should only add the warning and local_irq_enable() > should go into arch/alpha/kernel/signal.c:do_notify_resume(). > > In any case arch/alpha/ should be fixed imho. Oleg, could you check current signal.git#for-next? alpha patches in there ought to deal with the do_notify_resume() mess on alpha for good, AFAICS. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] [media] stk1160: Remove dead code from stk1160_i2c_read_reg()
There are two checks for 'rc' being less than zero with no change to 'rc' between the two, so the second is just dead code - remove it. Signed-off-by: Jesper Juhl --- drivers/media/usb/stk1160/stk1160-i2c.c |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/stk1160/stk1160-i2c.c b/drivers/media/usb/stk1160/stk1160-i2c.c index 176ac93..035cf8c 100644 --- a/drivers/media/usb/stk1160/stk1160-i2c.c +++ b/drivers/media/usb/stk1160/stk1160-i2c.c @@ -117,9 +117,6 @@ static int stk1160_i2c_read_reg(struct stk1160 *dev, u8 addr, return rc; stk1160_read_reg(dev, STK1160_SBUSR_RD, value); - if (rc < 0) - return rc; - return 0; } -- 1.7.1 -- Jesper Juhlhttp://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] gpio: add TS-5500 DIO headers support
On Sat, Oct 13, 2012 at 12:04 AM, Vivien Didelot wrote: > About the generic driver (to allow registering one platform device per > DIO block), I think it won't be possible, because there are shared > regions, such as 0x7d, used by DIO2 and LCD DIO for direction... Probably true. > Is there a way to share this, or does this mean that this driver should > handle the 3 blocks as it already does? I think you should try to handle all 3 for the moment atleast. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ 097/120] rcu: Fix day-one dyntick-idle stall-warning bug
On Thu, 2012-10-11 at 10:00 +0900, Greg Kroah-Hartman wrote:
> 3.4-stable review patch. If anyone has any objections, please let me know.
>
> --
>
> From: "Paul E. McKenney"
>
> commit a10d206ef1a83121ab7430cb196e0376a7145b22 upstream.
[...]
> This commit therefore makes CPUs check more carefully before starting a
> new grace period. This new check relies on an array of tail pointers
> into each CPU's list of callbacks. If the CPU is up to date on which
> grace periods have completed, it checks to see if any callbacks follow
> the RCU_DONE_TAIL segment, otherwise it checks to see if any callbacks
> follow the RCU_WAIT_TAIL segment. The reason that this works is that
> the RCU_WAIT_TAIL segment will be promoted to the RCU_DONE_TAIL segment
> as soon as the CPU is officially notified that the old grace period
> has ended.
[...]
> --- a/kernel/rcutree.c
> +++ b/kernel/rcutree.c
> @@ -295,7 +295,9 @@ cpu_has_callbacks_ready_to_invoke(struct
> static int
> cpu_needs_another_gp(struct rcu_state *rsp, struct rcu_data *rdp)
> {
> - return *rdp->nxttail[RCU_DONE_TAIL] && !rcu_gp_in_progress(rsp);
> + return *rdp->nxttail[RCU_DONE_TAIL +
> + ACCESS_ONCE(rsp->completed) != rdp->completed] &&
This is a very obscurely written expression. The array index is parsed
as:
(RCU_DONE_TAIL + ACCESS_ONCE(rsp->completed)) != rdp->completed
Since RCU_DONE_TAIL == 0 and RCU_WAIT_TAIL == 1, this is then equivalent
to:
ACCESS_ONCE(rsp->completed) != rdp->completed
or:
(ACCESS_ONCE(rsp->completed) != rdp->completed) ? RCU_WAIT_TAIL :
RCU_DONE_TAIL
But whyever didn't you write that explicitly?
Ben.
> +!rcu_gp_in_progress(rsp);
> }
>
> /*
--
Ben Hutchings
Kids! Bringing about Armageddon can be dangerous. Do not attempt it in
your own home. - Terry Pratchett and Neil Gaiman, `Good Omens'
signature.asc
Description: This is a digitally signed message part
Re: [PATCH] gpio: add TS-5500 DIO headers support
Hi Linus, On Fri, 2012-10-12 at 22:53 +0200, Linus Walleij wrote: > Well that may also be a pretty big step if you just want to mux > one bank of GPIO. I'm a bit ambivalent. But if you want to tie > pin and gpio information together and name all pins, pinctrl > is what should suit you best. > > In the GPIO world, things are opaque "gpios" not really pins. Thanks a lot for all your comments. I think I'll stick with the GPIO framework for the moment, trying to keep it as simple as possible. About the generic driver (to allow registering one platform device per DIO block), I think it won't be possible, because there are shared regions, such as 0x7d, used by DIO2 and LCD DIO for direction... Is there a way to share this, or does this mean that this driver should handle the 3 blocks as it already does? Thanks, Vivien -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/3] Do not use acpi_device to find pci root bridge in _init code.
On Fri, Oct 12, 2012 at 11:34 AM, Yinghai Lu wrote: > On Fri, Oct 12, 2012 at 3:54 AM, Jiang Liu wrote: >> On 2012-10-12 18:42, Tang Chen wrote: >>> On 10/12/2012 06:36 PM, Jiang Liu wrote: I have sent a similar patch to Yinghai before. For simplicity, we could use acpi_match_object_info_ids() instead of acpi_match_device_ids() directly. >>> >>> Hum, I must have missed it. :) >>> Using acpi_match_object_info_ids() directly seems good. I'm just worry >>> about if it could cause any other problem. :) >>> >>> So now, is this bug fixed ? And we don't need these patches, right ? >>> >>> Thanks. :) >> I think Yinghai has missed my patch too, so just suggest to use >> acpi_match_object_info_ids() directly. > > i put that patch from Jiang in my branch for while, and later found it > cause pci_root_bus notifying > do not work anymore, so i dropped that. I updated three patches and put them into my for-pci-split-pci-root-hp-2 branch. http://git.kernel.org/?p=linux/kernel/git/yinghai/linux-yinghai.git;a=shortlog;h=refs/heads/for-pci-split-pci-root-hp-2 git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git for-pci-split-pci-root-hp-2 Thanks Yinghai 0001-ACPI-Introduce-a-new-acpi-handle-to-determine-HID-ma.patch Description: Binary data 0002-PCI-correctly-detect-ACPI-PCI-host-bridge-objects.patch Description: Binary data 0003-PCI-ACPI-debug-print-for-installation-of-acpi-root-b.patch Description: Binary data
Re: [RFC PATCH 3/3] Convert mce_disabled
On Fri, Oct 12, 2012 at 05:46:16PM +, Luck, Tony wrote: > > Or, you can modify the mca_config I have there and use bools and pass a > > pointer to each actual bool member in each DEVICE_BIT_ATTR invocation > > (and rename it to DEVICE_BOOL_ATTR). Yeah, that could work, unless I'm > > missing something else, of course. > > This looks like the best solution to me. Sure we use a little more memory for > a "bool" for each option instead of just a single bit. But there are only a > handful of them, not thousands. So I think we can cope with a few extra > bytes of memory consumption. I was still not completely convinced by the > >if (val) >*bvec |= le64_to_cpu(BIT_64(bit)); > > solution - it assumes that big endian machines also assign their bit numbers > in a big->little way - but that isn't required by the C standard. bitfields > are > assigned at the whim of the compiler writer (the only restrictions seem to > be on alignments of fields w.r.t. to the underlying data types). Ok, it seems that would've been a can of worms if we'd opened it. Fortunately, if we do bools and we pass a pointer to the respective bool member of mca_config, we won't need to do that anymore. Instead simply: *bool_ptr = !!val; It can't get any simpler than that. I'll give it a try soon to see whether it pans out as I'm imagining it. Thanks. -- Regards/Gruss, Boris. Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach GM: Alberto Bozzo Reg: Dornach, Landkreis Muenchen HRB Nr. 43632 WEEE Registernr: 129 19551 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [RFT/PATCH] serial: omap: prevent resume if device is not suspended.
* Kevin Hilman [121012 13:34]: > > I'm not conviced (yet) that a mismatch is the root cause. Yes, that's > what the author of $SUBJECT patch assumed and stated, but I'm not > pursuaded. > > If it's an improperly configured mux issue, then the UART will break > whenever the device is actually omap_device_enable'd, whether in the > driver or in the bus layer. I tried booting n800 here with CONFIG_OMAP_MUX disabled, and no change. Serial console output stops right when the console initializes. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] [ARM] Use AT() in the linker script to create correct program headers
On Wed, Oct 10, 2012 at 10:55:44AM +0100, Dave Martin wrote: > As a side comment, some things such as MAC addresses can be probed and > set from userspace after kernel boot, assuming that you have a way > to fetch the device description blob from userspace. If it's accessible > via MTD I'm guessing you may have some chance of doing that. Yes, there is a whole wack of other data in this structure (serial numbers, etc) that are captured and used by userspace, so access is always made possible. Setting the MAC via userspace is interesting, I will bear that in mind. However, we have several development-support boot scenarios that enable the ethernet before the userspace code to fetch the data structure is loaded - one of interest has the kernel's initramfs perform a NBD mount of the actual application filesystem. So having the kernel tend to this is very convenient. > However, I worry that if you have to run hardware-dependent code in > order to fetch or generate parts of the DT, then we have a chicken- > and-egg problem with no guaranteed solution with the frameworks that > exist today -- although I am not familiar with how DT gets used on > all other arches, so you might have counterexamples I'm not aware of. Certainly, in some cases, (like what I have done) such kernels are non-generic and could only work with the hardware they are intended for. However, if you assume the bootloader provides a dtb (even an incomplete one would do) then fixups/replacements/whatever could be run based on tags in the dtb without creating a chicken-and-egg problem. > At least in ARM-land, the DT is inherently monolithic and static: the > DT is not expected to change once you enter the kernel. Sort of, it is the same on all arches, the DT block is expected to remain valid, but all the of_node pointers go directly into the block so you can alter values but not the structure without breaking any invariants. As an example our DTBs all have mac address blocks, with a 0 value. The fixup simply overwrites with the correct value before the ethernet driver reads from it. > > I'm not sure there is a great interest in this? What are other folks > > working on production embedded stuff doing? I suppose that will be > > more clear as device tree is rolled out. > > For now, the architecturally simplest solution still seems to me to be > to write your own boot shim which customises the DT before booting the > kernel. As discussed, this can continue to look like a simple ELF image > from the bootloader's point of view -- but I appreciate that it will > involve effort and some duplication of some low-level driver components. I admit, I am a bit conflicted. Viewing from the kernel perspective, I definitely think this kind of very low level extremely board specific stuff should not be in the kernel. That could be a maintenance nightmare. However, as an OEM, I need the smallest, simplest boot loader possible so I want to push this into the kernel to lighten my development load. > Your problem is unlikely to affect people outside the embedded space > too much, but it doesn't sound likely to be unique. Agreed.. This thread has left the original topic, what do you think I should do with the linker patch? Jason -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [Xen-devel] [PATCH V2 1/7]: PVH: basic and header changes, elfnote changes, ...
On Fri, 12 Oct 2012 09:48:48 +0100 Ian Campbell wrote: > > index fdce49c..9323b8c 100644 > > --- a/arch/x86/xen/Kconfig > > +++ b/arch/x86/xen/Kconfig > > @@ -50,3 +50,13 @@ config XEN_DEBUG_FS > > Enable statistics output and various tuning options in > > debugfs. Enabling this option may incur a significant performance > > overhead. > > +config XEN_X86_PVH > > + bool "Support for running as a PVH guest (EXPERIMENTAL)" > > + depends on X86_64 && XEN && INTEL_IOMMU && EXPERIMENTAL > > OOI why does the kernel side require an INTEL_IOMMU? I can see why the > hypervisor would need it but the guests (including dom0) can't > actually see the underlying IOMMU, can they? Well, the kernel requires the hypervisor to have it, but I guess thats not what this is referring to. The tools can decide that. I'll take it out. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Linux 3.0.46
I'm announcing the release of the 3.0.46 kernel. All users of the 3.0 kernel series must upgrade. The updated 3.0.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h Makefile|2 arch/mn10300/Makefile |2 arch/x86/include/asm/pgtable.h | 11 drivers/acpi/bus.c |8 drivers/block/aoe/aoecmd.c |1 drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 drivers/gpu/drm/radeon/radeon_pm.c |8 drivers/media/rc/ite-cir.c |2 drivers/mtd/maps/autcpu12-nvram.c | 19 - drivers/mtd/nand/nand_bbt.c |2 drivers/mtd/nand/nandsim.c |1 drivers/mtd/nand/omap2.c|3 drivers/net/davinci_cpdma.c |1 drivers/net/netxen/netxen_nic_main.c|4 drivers/net/pppoe.c |2 drivers/net/r8169.c | 444 drivers/net/tg3.c | 14 - drivers/net/usb/sierra_net.c|2 drivers/net/wan/ixp4xx_hss.c|1 drivers/pci/hotplug/acpiphp_glue.c |7 drivers/pci/probe.c |6 drivers/s390/scsi/zfcp_aux.c|1 drivers/s390/scsi/zfcp_ccw.c| 73 - drivers/s390/scsi/zfcp_cfdc.c |2 drivers/s390/scsi/zfcp_dbf.c| 20 + drivers/s390/scsi/zfcp_dbf.h|1 drivers/s390/scsi/zfcp_def.h|2 drivers/s390/scsi/zfcp_ext.h|2 drivers/s390/scsi/zfcp_fsf.c| 23 + drivers/s390/scsi/zfcp_sysfs.c | 18 + drivers/s390/scsi/zfcp_unit.c | 36 +- drivers/scsi/atp870u.c | 11 fs/ext4/inode.c |8 fs/ext4/move_extent.c |7 fs/ext4/namei.c |2 include/linux/mempolicy.h |2 include/linux/xfrm.h|2 include/net/xfrm.h |3 kernel/cpuset.c |3 kernel/rcutree.c|4 kernel/sched.c | 40 ++ kernel/sys.c|1 kernel/workqueue.c |2 lib/gcd.c |3 mm/mempolicy.c | 137 ++--- mm/truncate.c |3 net/8021q/vlan_core.c |3 net/core/dev.c | 14 - net/core/sock.c |3 net/ipv4/raw.c | 14 - net/ipv4/tcp.c | 10 net/ipv6/mip6.c | 20 - net/ipv6/raw.c | 21 - net/ipv6/route.c| 11 net/l2tp/l2tp_eth.c |2 net/netrom/af_netrom.c |7 net/sched/sch_cbq.c |5 net/sched/sch_qfq.c |5 net/sctp/output.c | 21 + net/xfrm/xfrm_input.c |2 net/xfrm/xfrm_policy.c |2 net/xfrm/xfrm_replay.c | 15 + net/xfrm/xfrm_user.c| 57 +++- scripts/Kbuild.include |2 sound/drivers/aloop.c |6 sound/soc/codecs/wm9712.c |2 sound/usb/mixer.c |7 sound/usb/quirks-table.h| 53 +++ 68 files changed, 944 insertions(+), 294 deletions(-) Alan Cox (1): netrom: copy_datagram_iovec can fail Alex Deucher (3): drm/radeon: only adjust default clocks on NI GPUs drm/radeon: Add MSI quirk for gateway RS690 drm/radeon: force MSIs on RS690 asics Alexander Shiyan (1): mtd: autcpu12-nvram: Fix compile breakage Andrea Arcangeli (1): mm: thp: fix pmd_present for split_huge_page and PROT_NONE with THP Andreas Bießmann (2): mtd: omap2: fix omap_nand_remove segfault mtd: omap2: fix module loading Antonio Quartulli (1): 8021q: fix mac_len recomputation in vlan_untag() Ben Hutchings (1): media: rc: ite-cir: Initialise ite_dev::rdev earlier Bernd Schubert (1): ext4: always set i_op in ext4_mknod() Bjorn Helgaas (1): PCI: acpiphp: check whether _ADR evaluation succeeded Chema Gonzalez (1): net: small bug on rxhash calculation David Henningsson (1): ALSA: usb - disable broken hw volume for Tenx TP6911 Davidlohr Bueso (1): lib/gcd.c: prevent possible div by 0 Devendra Naga (1): r8169: call netif_napi_del at errpaths and at driver unload Dmitry Monakhov (1):
Linux 3.4.14
I'm announcing the release of the 3.4.14 kernel. All users of the 3.4 kernel series must upgrade. The updated 3.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h Makefile |2 arch/alpha/kernel/process.c |4 arch/cris/kernel/process.c |3 arch/frv/kernel/process.c|3 arch/h8300/kernel/process.c |3 arch/ia64/kernel/process.c |3 arch/m32r/kernel/process.c |3 arch/m68k/kernel/process.c |3 arch/mips/Makefile |2 arch/mips/kernel/Makefile|2 arch/mn10300/Makefile|2 arch/mn10300/kernel/process.c|3 arch/parisc/kernel/process.c |3 arch/powerpc/include/asm/pci-bridge.h|8 arch/powerpc/platforms/pseries/eeh.c |2 arch/score/kernel/process.c |4 arch/x86/Makefile|2 arch/x86/boot/compressed/Makefile|3 arch/x86/include/asm/pgtable.h | 11 - arch/x86/platform/efi/efi.c |1 arch/xtensa/kernel/process.c |3 drivers/acpi/bus.c |8 drivers/base/power/main.c|2 drivers/block/aoe/aoecmd.c |1 drivers/dma/dmaengine.c |2 drivers/gpu/drm/drm_crtc.c |8 drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 + drivers/gpu/drm/radeon/radeon_pm.c |8 drivers/gpu/drm/savage/savage_bci.c |2 drivers/iommu/intel-iommu.c |4 drivers/media/rc/ite-cir.c |2 drivers/media/video/gspca/pac7302.c |1 drivers/mfd/max8925-core.c | 10 + drivers/mmc/host/omap_hsmmc.c|3 drivers/mmc/host/sh_mmcif.c |4 drivers/mtd/maps/autcpu12-nvram.c| 19 +- drivers/mtd/mtdpart.c|5 drivers/mtd/nand/nand_bbt.c |2 drivers/mtd/nand/nandsim.c |1 drivers/mtd/nand/omap2.c |3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 12 - drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c |4 drivers/net/ethernet/realtek/r8169.c | 21 ++ drivers/net/ethernet/ti/davinci_cpdma.c |1 drivers/net/ppp/pppoe.c |2 drivers/net/rionet.c | 20 +- drivers/net/usb/sierra_net.c |2 drivers/net/wan/ixp4xx_hss.c |1 drivers/pci/hotplug/acpiphp_glue.c | 13 - drivers/pci/probe.c |6 drivers/s390/scsi/zfcp_aux.c |1 drivers/s390/scsi/zfcp_ccw.c | 73 ++- drivers/s390/scsi/zfcp_cfdc.c|2 drivers/s390/scsi/zfcp_dbf.c | 22 ++ drivers/s390/scsi/zfcp_dbf.h |1 drivers/s390/scsi/zfcp_def.h |2 drivers/s390/scsi/zfcp_ext.h |2 drivers/s390/scsi/zfcp_fsf.c | 57 +- drivers/s390/scsi/zfcp_qdio.c| 16 + drivers/s390/scsi/zfcp_sysfs.c | 18 + drivers/s390/scsi/zfcp_unit.c| 36 ++- drivers/scsi/atp870u.c | 11 + fs/cifs/cifs_unicode.c | 22 ++ fs/cifs/connect.c|9 fs/ext4/inode.c | 25 +- fs/ext4/move_extent.c| 174 +-- fs/ext4/namei.c |2 fs/ext4/resize.c | 26 ++ fs/ext4/super.c |2 fs/fs-writeback.c|1 fs/jbd2/journal.c|5 fs/jffs2/wbuf.c |8 fs/proc/page.c |8
Re: [Xen-devel] [PATCH V2 0/7]: PVH: PV guest with extensions
On Fri, 12 Oct 2012 10:18:31 +0100 Ian Campbell wrote: > On Thu, 2012-10-11 at 22:49 +0100, Mukesh Rathor wrote: > > Hi guys, > > > > Ok, I've made all the changes from prev RFC patch submissions. > > Tested all the combinations. The patches are organized slightly > > differently from prev version because of the nature of changes > > after last review. I am building xen patch just for the > > corresponding header file changes. Following that I'll refresh xen > > tree, debug, test, and send patches. > > > > For linux kernel mailing list introduction, PVH is a PV guest that > > can run in an HVM container, uses native pagetables, uses callback > > vector, native IDT, and native syscalls. > > > > They were built on top of 89d0307af2b9957d59bfb2a86aaa57464ff921de > > commit. > > I took a (fairly quick) look. I had a few comments but overall looks > pretty good, thanks! > > I'm constantly amazed by how small this patchset is. I suspect you are > going to make up for it in the hypervisor side ;-) Hehe... yes! The patch has become almost half since I first got it working. Each review trims it down :). thanks Mukesh -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Linux 3.5.7
I'm announcing the release of the 3.5.7 kernel. Note, this is the LAST 3.5.y kernel release, it is now end-of-life. Please move to the 3.6 kernel branch at this time. All users of the 3.5 kernel series must upgrade. The updated 3.5.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.5.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h Makefile |2 arch/alpha/kernel/process.c |3 arch/arm/include/asm/syscall.h |1 arch/cris/kernel/process.c |3 arch/frv/kernel/process.c|3 arch/h8300/kernel/process.c |3 arch/ia64/kernel/process.c |3 arch/m32r/kernel/process.c |3 arch/m68k/kernel/process.c |3 arch/mips/Makefile |2 arch/mips/ath79/clock.c |4 arch/mips/kernel/Makefile|2 arch/mn10300/Makefile|2 arch/mn10300/kernel/process.c|3 arch/parisc/kernel/process.c |3 arch/powerpc/include/asm/pci-bridge.h|8 arch/powerpc/platforms/pseries/eeh.c |2 arch/score/kernel/process.c |4 arch/x86/Makefile|2 arch/x86/boot/compressed/Makefile|3 arch/x86/include/asm/pgtable.h | 11 - arch/x86/kvm/vmx.c | 70 +-- arch/x86/platform/efi/efi.c |1 arch/xtensa/kernel/process.c |3 drivers/acpi/bus.c |8 drivers/base/core.c |4 drivers/base/power/main.c|2 drivers/block/aoe/aoecmd.c |1 drivers/gpu/drm/drm_crtc.c |8 drivers/gpu/drm/i915/i915_irq.c | 16 - drivers/gpu/drm/i915/i915_reg.h |3 drivers/gpu/drm/i915/intel_display.c | 26 ++ drivers/gpu/drm/i915/intel_pm.c |5 drivers/gpu/drm/i915/intel_ringbuffer.c |7 drivers/gpu/drm/nouveau/nvc0_fence.c | 25 ++ drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 + drivers/gpu/drm/radeon/radeon_pm.c |8 drivers/gpu/drm/savage/savage_bci.c |2 drivers/iommu/intel-iommu.c |4 drivers/media/rc/ite-cir.c |2 drivers/media/video/em28xx/em28xx-cards.c| 22 +- drivers/media/video/gspca/pac7302.c |1 drivers/mfd/max8925-core.c | 10 + drivers/mmc/host/omap_hsmmc.c|3 drivers/mmc/host/sh_mmcif.c |4 drivers/mtd/maps/autcpu12-nvram.c| 19 +- drivers/mtd/mtdpart.c|5 drivers/mtd/nand/nand_bbt.c |2 drivers/mtd/nand/nandsim.c |1 drivers/mtd/nand/omap2.c |3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 12 - drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c |5 drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c |4 drivers/net/ethernet/ti/davinci_cpdma.c |1 drivers/net/ppp/pppoe.c |2 drivers/net/rionet.c | 20 +- drivers/net/usb/sierra_net.c |2 drivers/net/wan/ixp4xx_hss.c |1 drivers/pci/hotplug/acpiphp_glue.c | 13 - drivers/pci/probe.c |6 drivers/s390/scsi/zfcp_aux.c |1 drivers/s390/scsi/zfcp_ccw.c | 73 ++- drivers/s390/scsi/zfcp_cfdc.c|2 drivers/s390/scsi/zfcp_dbf.c | 22 ++ drivers/s390/scsi/zfcp_dbf.h |1 drivers/s390/scsi/zfcp_def.h |2 drivers/s390/scsi/zfcp_ext.h |2 drivers/s390/scsi/zfcp_fsf.c | 57 +- drivers/s390/scsi/zfcp_qdio.c| 16 + drivers/s390/scsi/zfcp_sysfs.c | 18 + drivers/s390/scsi/zfcp_unit.c| 36 ++-
Linux 3.6.2
I'm announcing the release of the 3.6.2 kernel. All users of the 3.6 kernel series must upgrade. The updated 3.6.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.6.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h Makefile |2 arch/alpha/kernel/process.c |3 arch/arm/include/asm/syscall.h |1 arch/cris/kernel/process.c |3 arch/frv/kernel/process.c|3 arch/h8300/kernel/process.c |3 arch/ia64/kernel/process.c |3 arch/m32r/kernel/process.c |3 arch/m68k/kernel/process.c |3 arch/mips/Makefile |2 arch/mips/ath79/clock.c |4 arch/mips/kernel/Makefile|2 arch/mn10300/Makefile|2 arch/mn10300/kernel/process.c|3 arch/parisc/kernel/process.c |3 arch/powerpc/include/asm/pci-bridge.h|8 + arch/powerpc/kernel/iommu.c |5 arch/powerpc/lib/memcpy_power7.S |4 arch/powerpc/platforms/pseries/eeh.c |2 arch/powerpc/sysdev/dart_iommu.c | 12 + arch/score/kernel/process.c |4 arch/x86/Makefile|4 arch/x86/boot/compressed/Makefile|3 arch/x86/include/asm/pgtable.h | 11 + arch/x86/platform/efi/efi.c |1 arch/xtensa/kernel/process.c |3 drivers/acpi/bus.c |8 - drivers/base/power/main.c|2 drivers/dma/dmaengine.c |2 drivers/gpu/drm/drm_crtc.c |8 - drivers/gpu/drm/i915/i915_irq.c | 16 +- drivers/gpu/drm/i915/i915_reg.h |7 drivers/gpu/drm/i915/intel_display.c | 26 +++ drivers/gpu/drm/i915/intel_hdmi.c| 15 + drivers/gpu/drm/i915/intel_pm.c |5 drivers/gpu/drm/nouveau/nvc0_fence.c | 25 +++ drivers/gpu/drm/radeon/evergreen_cs.c| 59 ++- drivers/gpu/drm/radeon/r600_cs.c |3 drivers/gpu/drm/radeon/radeon_drv.c |4 drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 + drivers/gpu/drm/radeon/radeon_pm.c |8 - drivers/gpu/drm/savage/savage_bci.c |2 drivers/hid/hidraw.c | 69 +++-- drivers/i2c/busses/i2c-piix4.c |1 drivers/iommu/intel-iommu.c |4 drivers/media/dvb/frontends/drxk.h |2 drivers/media/dvb/frontends/drxk_hard.c | 20 +- drivers/media/rc/ite-cir.c |2 drivers/media/video/em28xx/em28xx-cards.c| 22 +- drivers/media/video/em28xx/em28xx-dvb.c |5 drivers/media/video/gspca/pac7302.c |3 drivers/mfd/88pm860x-core.c | 92 drivers/mfd/max8925-core.c | 10 + drivers/mmc/core/slot-gpio.c |8 - drivers/mmc/host/omap_hsmmc.c|3 drivers/mmc/host/sh_mmcif.c |4 drivers/mtd/maps/autcpu12-nvram.c| 19 +- drivers/mtd/mtdpart.c|5 drivers/mtd/nand/nand_bbt.c |2 drivers/mtd/nand/nandsim.c |1 drivers/mtd/nand/omap2.c |3 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c |5 drivers/net/ethernet/ti/davinci_cpdma.c |1 drivers/net/rionet.c | 20 ++ drivers/net/usb/asix_devices.c |4 drivers/pci/probe.c |6 drivers/s390/scsi/zfcp_aux.c |1 drivers/s390/scsi/zfcp_ccw.c | 73 - drivers/s390/scsi/zfcp_cfdc.c|2 drivers/s390/scsi/zfcp_dbf.c | 22 ++ drivers/s390/scsi/zfcp_dbf.h |1 drivers/s390/scsi/zfcp_def.h |2 drivers/s390/scsi/zfcp_ext.h |2 drivers/s390/scsi/zfcp_fsf.c | 57 ++- drivers/s390/scsi/zfcp_qdio.c| 16 +- drivers/s390/scsi/zfcp_sysfs.c | 18 ++ drivers/s390/scsi/zfcp_unit.c| 36 +++- drivers/scsi/atp870u.c
Re: Intel graphics drm issue?
Hi Mark, [CCing intel-gfx] On Fri, 12 October 2012 Mark Hounschell wrote: > Not sure this is the correct place to ask about a possible drm issue. I > have an intel based PC with an HDMI port that I'm trying to connect to > an LG TV. I have successfully used this HDMI port connected to an Optima > projector. Using that projector, everything from the BIOS post, BIOS > configuration, and all the way up to a graphical login worked just fine. > The same HDMI port and cable connected to this TV gives me the below > messages during boot. I also get no BIOS post or BIOS configuration > output while in the BIOS. I have a monitor connected to the DVI port so > I can see what I should see on the TV there, just as when I was > connected to the Optima projector. That alone makes me pretty sure it's > not a kernel issue but here are the messages anyway. Maybe they will > give someone a hint as to what the problem may be, in the case they > might be willing to give me any pointers. > > TV - LG 42lb9df > PC - intel DH77DF motherboard > [0.00] Linux version 3.4.10-lcrs (root@geexbox) (gcc version 4.7.1 > 20120723 [gcc-4_7-branch revision 189773] (SUSE Linux) ) #1 SMP PREEMPT Wed > Oct 10 16:16:16 EDT 2012 > ... > [1.897955] [drm] MTRR allocation failed. Graphics performance may suffer. > [1.898045] i915 :00:02.0: irq 43 for MSI/MSI-X > [1.898050] [drm] Supports vblank timestamp caching Rev 1 (10.10.2010). > [1.898051] [drm] Driver supports precise vblank timestamp query. > [1.898084] [drm:intel_dsm_platform_mux_info] *ERROR* MUX INFO call failed > [1.898737] vgaarb: device changed decodes: > PCI::00:02.0,olddecodes=io+mem,decodes=io+mem:owns=io+mem > [1.995523] [drm] Enabling RC6 states: RC6 on, RC6p on, RC6pp off > [2.299535] [drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, > remainder is 128 > [2.299865] Raw EDID: > [2.299957] ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff > [2.300188] ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff > [2.300418] ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff > [2.300648] ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff > [2.300879] ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff > [2.301109] ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff > [2.301339] ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff > [2.301569] ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff This looks like your LG TV either does not provide EDID information via HDMI connector, or otherwise behaves in a special way which makes reading EDID fail. Did you try the TV on some other computer to check if EDID can be read there (e.g. with nvidia/amd GPU and matching open/closed driver)? Also make sure the TV is on (neither off nor on stand-by) as some TVs disable too much of connector interface in those states. > [2.434378] i915 :00:02.0: HDMI-A-3: EDID block 0 invalid. > [2.477539] checking generic (e000 3ff) vs hw (e000 1000) > [2.477541] fb: conflicting fb hw usage inteldrmfb vs VESA VGA - removing > generic driver > [2.477549] Console: switching to colour dummy device 80x25 > [2.477831] fbcon: inteldrmfb (fb0) is primary device > [2.637915] Console: switching to colour frame buffer device 128x48 > [2.679625] fb0: inteldrmfb frame buffer device > [2.679626] drm: registered panic notifier > [2.691536] acpi device:4b: registered as cooling_device9 > [2.691660] input: Video Bus as > /devices/LNXSYSTM:00/device:00/PNP0A08:00/LNXVIDEO:00/input/input4 > [2.691698] ACPI: Video Device [GFX0] (multi-head: yes rom: no post: no) > [2.691709] [drm] Initialized i915 1.6.0 20080730 for :00:02.0 on > minor 0 > geexbox:/home/mplayer # lspci > 00:00.0 Host bridge: Intel Corporation Xeon E3-1200 v2/3rd Gen Core processor > DRAM Controller (rev 09) > ... > 00:02.0 VGA compatible controller: Intel Corporation Xeon E3-1200 v2/3rd Gen > Core processor Graphics Controller (rev 09) > ... Note, usually `lspci -nn` is more informative as it also provides vendor/device IDs in addition to nice names. Bruno -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ 011/120] lib/gcd.c: prevent possible div by 0
On Fri, Oct 12, 2012 at 10:11:24PM +0100, Ben Hutchings wrote: > On Thu, 2012-10-11 at 09:59 +0900, Greg Kroah-Hartman wrote: > > 3.4-stable review patch. If anyone has any objections, please let me know. > > > > -- > > > > From: Davidlohr Bueso > > > > commit e96875677fb2b7cb739c5d7769824dff7260d31d upstream. > > > > Account for all properties when a and/or b are 0: > > gcd(0, 0) = 0 > > gcd(a, 0) = a > > gcd(0, b) = b > > > > Fixes no known problems in current kernels. > [...] > > I can't believe this change is harmful, but unless there are some known > problems this doesn't meet the criteria for a stable update. It was discussed in the original thread of this patch that it would be a good idea to have this in the stable releases, and I agree. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree
On Thu, Oct 11, 2012 at 8:06 PM, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 10:22 Thu 11 Oct , Lee Jones wrote: >> The board could actually be called either ccu9540, or just >> u9540. I picked one and went with it. The full name is the >> u9540 development board. > > so use ccu9540 as u9540 is the soc name so if we use u9540 as compatible we > expect to mach the soc and not a board I basically agree. However the SoC (digital ASIC) is named DB9540. U9540 is the entire chipset (DB9540, AB9540 etc) a variant of the NovaThor series. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ 011/120] lib/gcd.c: prevent possible div by 0
On Thu, 2012-10-11 at 09:59 +0900, Greg Kroah-Hartman wrote: > 3.4-stable review patch. If anyone has any objections, please let me know. > > -- > > From: Davidlohr Bueso > > commit e96875677fb2b7cb739c5d7769824dff7260d31d upstream. > > Account for all properties when a and/or b are 0: > gcd(0, 0) = 0 > gcd(a, 0) = a > gcd(0, b) = b > > Fixes no known problems in current kernels. [...] I can't believe this change is harmful, but unless there are some known problems this doesn't meet the criteria for a stable update. Ben. -- Ben Hutchings Kids! Bringing about Armageddon can be dangerous. Do not attempt it in your own home. - Terry Pratchett and Neil Gaiman, `Good Omens' signature.asc Description: This is a digitally signed message part
[PATCH] iw_cxgb4: do not free chunk that we have failed to allocate
In the error path of registering memory, in case there is a failure when
trying to allocate a chunk from the memory pool, it will try to free the
same chunk, which will BUG.
Signed-off-by: Thadeu Lima de Souza Cascardo
---
drivers/infiniband/hw/cxgb4/mem.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/infiniband/hw/cxgb4/mem.c
b/drivers/infiniband/hw/cxgb4/mem.c
index 57e07c6..afd8179 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -468,7 +468,7 @@ struct ib_mr *c4iw_register_phys_mem(struct ib_pd *pd,
ret = alloc_pbl(mhp, npages);
if (ret) {
kfree(page_list);
- goto err_pbl;
+ goto err;
}
ret = write_pbl(>rhp->rdev, page_list, mhp->attr.pbl_addr,
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] genalloc: the chunk bitmap should be sized as a multiple of long
A gen_pool_chunk uses a bitmap to find what addresses ranges it has allocated and bugs when we destroy the pool and a chunk has some bits set. There is a problem when it allocates the bitmap. It allocates only the number of bytes needed for the bits that represent the size it's allocating. That is, if it needs 16 bits, it will allocate only 2 bytes, if it needs 31 bits, it will allocate 4 bytes. However, the bitops functions uses long types. And when the gen_pool_add allocates a bitmap, it only clears the bytes it has allocated. So, it's possible that we have a long word with the contents 0x, and only the first (most significant) bytes are cleared by memset. However, the destroy function is going to test for the least significant bits, which will not be clear as expected. Signed-off-by: Thadeu Lima de Souza Cascardo --- lib/genalloc.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/genalloc.c b/lib/genalloc.c index ca208a9..5492043 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -178,7 +178,7 @@ int gen_pool_add_virt(struct gen_pool *pool, unsigned long virt, phys_addr_t phy struct gen_pool_chunk *chunk; int nbits = size >> pool->min_alloc_order; int nbytes = sizeof(struct gen_pool_chunk) + - (nbits + BITS_PER_BYTE - 1) / BITS_PER_BYTE; + BITS_TO_LONGS(nbits) * sizeof(long); chunk = kmalloc_node(nbytes, GFP_KERNEL | __GFP_ZERO, nid); if (unlikely(chunk == NULL)) -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] input: gpio-keys: Add runtime support
On Thu, Oct 11, 2012 at 4:22 PM, Shubhrajyoti Datta
wrote:
>> @@ -526,6 +527,7 @@ static int gpio_keys_open(struct input_dev *input)
>> {
>> struct gpio_keys_drvdata *ddata = input_get_drvdata(input);
>>
>> + pm_runtime_get_sync(input->dev.parent);
>
> I am not an expert of the runtime.
>
> However would be grateful if you explain me what it actually do.
This increase the reference count of the runtime status container
for the device. _sync makes sure it happens now.
Consult:
Documentation/power/runtime_pm.txt
> Also I did not see any runtime suspend/ resume handlers populated.
It is not necessary to handle the power state at the driver level,
it can just as well be handled by the voltage/power domain,
or at the class, type or bus level.
But the individual driver has to notify the system upward if it
needs to be powered on or when it may or must be relaxed.
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] perf: teach perf inject to merge sched_stat_* and sched_switch events (v3)
Hello Frederic,
Could you write your opinion about this patch? Here are fixed all
bugs, which you mentioned for the previous version.
Thanks.
2012/9/18 Andrew Vagin :
> You may want to know where and how long a task is sleeping. A callchain
> may be found in sched_switch and a time slice in stat_iowait, so I add
> handler in perf inject for merging this events.
>
> My code saves sched_switch event for each process and when it meets
> stat_iowait, it reports the sched_switch event, because this event
> contains a correct callchain. By another words it replaces all
> stat_iowait events on proper sched_switch events.
>
> v2: - remove the global variable "session"
> - hadle errors from malloc()
>
> v3: - use sample->tid instead of sample->pid for merging events.
>
> Frederic Weisbecker noticed that this code works only in a root pidns.
> It's true, because a pid from trace content is not pid-namespace safe
> and currently no way to get this pid in a current pidns. This problem
> is more general, so I don't think that it should be solved in this series.
>
> Cc: Arnaldo Carvalho de Melo
> Cc: Frederic Weisbecker
> Cc: Peter Zijlstra
> Cc: Paul Mackerras ,
> Cc: Ingo Molnar Cc: Andi Kleen
> Cc: David Ahern
> Signed-off-by: Andrew Vagin
> ---
> tools/perf/Documentation/perf-inject.txt |4 ++
> tools/perf/builtin-inject.c | 86
> ++
> 2 files changed, 90 insertions(+), 0 deletions(-)
>
> diff --git a/tools/perf/Documentation/perf-inject.txt
> b/tools/perf/Documentation/perf-inject.txt
> index 6be2101..c04e0c6 100644
> --- a/tools/perf/Documentation/perf-inject.txt
> +++ b/tools/perf/Documentation/perf-inject.txt
> @@ -35,6 +35,10 @@ OPTIONS
> -o::
> --output=::
> Output file name. (default: stdout)
> +-s::
> +--sched-stat::
> + Merge sched_stat and sched_switch for getting events where and how
> long
> + tasks slept.
>
> SEE ALSO
>
> diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
> index ed12b19..1783f0a 100644
> --- a/tools/perf/builtin-inject.c
> +++ b/tools/perf/builtin-inject.c
> @@ -8,11 +8,13 @@
> #include "builtin.h"
>
> #include "perf.h"
> +#include "util/evsel.h"
> #include "util/session.h"
> #include "util/tool.h"
> #include "util/debug.h"
>
> #include "util/parse-options.h"
> +#include "util/trace-event.h"
>
> static const char *input_name = "-";
> static const char *output_name= "-";
> @@ -21,6 +23,7 @@ static intoutput;
> static u64 bytes_written;
>
> static boolinject_build_ids;
> +static boolinject_sched_stat;
>
> static int perf_event__repipe_synth(struct perf_tool *tool __used,
> union perf_event *event,
> @@ -213,6 +216,83 @@ repipe:
> return 0;
> }
>
> +struct event_entry {
> + struct list_head node;
> + u32 tid;
> + union perf_event event[0];
> +};
> +
> +static LIST_HEAD(samples);
> +
> +static int perf_event__sched_stat(struct perf_tool *tool,
> + union perf_event *event,
> + struct perf_sample *sample,
> + struct perf_evsel *evsel,
> + struct machine *machine)
> +{
> + const char *evname = NULL;
> + uint32_t size;
> + struct event_entry *ent;
> + union perf_event *event_sw = NULL;
> + struct perf_sample sample_sw;
> + int sched_process_exit;
> +
> + size = event->header.size;
> +
> + evname = evsel->tp_format->name;
> +
> + sched_process_exit = !strcmp(evname, "sched_process_exit");
> +
> + if (!strcmp(evname, "sched_switch") || sched_process_exit) {
> + list_for_each_entry(ent, , node)
> + if (sample->tid == ent->tid)
> + break;
> +
> + if (>node != ) {
> + list_del(>node);
> + free(ent);
> + }
> +
> + if (sched_process_exit)
> + return 0;
> +
> + ent = malloc(size + sizeof(struct event_entry));
> + if (ent == NULL)
> + die("malloc");
> + ent->tid = sample->tid;
> + memcpy(>event, event, size);
> + list_add(>node, );
> + return 0;
> +
> + } else if (!strncmp(evname, "sched_stat_", 11)) {
> + u32 pid;
> +
> + pid = raw_field_value(evsel->tp_format,
> + "pid", sample->raw_data);
> +
> + list_for_each_entry(ent, , node) {
> + if (pid == ent->tid)
> + break;
> + }
> +
> + if (>node == )
> + return 0;
> +
> + event_sw = >event[0];
> +
Re: [PATCH 02/16] f2fs: add on-disk layout
On Friday 05 October 2012 20:56:44 김재극 wrote:
> +struct f2fs_nat_entry {
> + __u8 version;
> + __le32 ino;
> + __le32 block_addr;
> +} __packed;
> +
> +struct f2fs_nat_block {
> + struct f2fs_nat_entry entries[NAT_ENTRY_PER_BLOCK];
> +} __packed;
Using "__packed" on structure is rather inefficient on CPU architectures
that cannot do aligned accesses. I would suggest you remove this
attribute everywhere you can. The f2fs_nat_entry is particularly
suboptimal because it is 9 bytes long, and I'm not sure if this
can be reasonably changed to a multiple of four.
In all other cases, you should try to lay out the structures
so that each member is naturally aligned and you don't need any __packed
attributes, in particular for those that are accessed a lot.
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH RFC 2/2] [x86] Optimize copy_page by re-arranging instruction sequence and saving register
Here are some Phenom results for that benchmark. The average time increases from 700 to 760 cycles (+8.6%). vendor_id : AuthenticAMD cpu family : 16 model : 2 model name : AMD Phenom(tm) 9850 Quad-Core Processor stepping: 3 microcode : 0x183 cpu MHz : 2500.210 cache size : 512 KB flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs hw_pstate npt lbrv svm_lock bogomips: 5000.42 TLB size: 1024 4K pages clflush size: 64 cache_alignment : 64 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 678 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 667 760 TPT: Len 4096, alignment 0/ 0: 673 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 667 760 TPT: Len 4096, alignment 0/ 0: 673 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 671 760 TPT: Len 4096, alignment 0/ 0: 673 760 TPT: Len 4096, alignment 0/ 0: 671 760 TPT: Len 4096, alignment 0/ 0: 709 760 TPT: Len 4096, alignment 0/ 0: 708 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 667 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 671 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 678 760 TPT: Len 4096, alignment 0/ 0: 709 758 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 709 759 TPT: Len 4096, alignment 0/ 0: 710 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 680 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 667 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 709 760 TPT: Len 4096, alignment 0/ 0: 709 759 TPT: Len 4096, alignment 0/ 0: 710 760 copy_page_org copy_page_new TPT: Len 4096, alignment 0/ 0: 678 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 TPT: Len 4096, alignment 0/ 0: 710 760 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [patch] gpio-timberdale: fix a potential wrapping issue
On Thu, Oct 11, 2012 at 8:56 AM, Dan Carpenter wrote: > ->last_ier is an unsigned long but the high bits can't be used int the > original code because the shift wraps. > > Signed-off-by: Dan Carpenter Applied, thanks! Should we send this to stable? (I assume so ...) Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH] genirq: for edge interrupt IRQS_ONESHOT support with irq thread
On Fri, 12 Oct 2012, Liu, Chuansheng wrote: > > > But IRQS_ONESHOT does not work well for edge interrupt. > > > And pasting the IRQS_ONESHOT description: > > > * IRQS_ONESHOT- irq is not unmasked in primary handler > > > > Right, and edge type interrupts doe not support it. > > Can we do something? Thanks your sharing. No, we cannot do anything. The edge handler is not going to change. End of story. > In request_thread_irq() case with FLAG IRQS_ONESHOT, for edge interrupt, > in function irq_finalize_oneshot(): > if (!desc->threads_oneshot && !irqd_irq_disabled(>irq_data) && > irqd_irq_masked(>irq_data)) > unmask_irq(desc); > > It is possible unmask_irq() is called, but the below code is just > aiming for masking action in irq handler, so I guess if I called the > mask_irq() in non-core code, when irq_finalize_oneshot is called, > the unmask_irq is called, and it is not we wanted, right? Do not > test this case:) You're guessing wrong again. Non core code CANNOT call mask_irq() except via irq_disable(). No have a look at irq_disable() and then read the above condition again. Thanks, tglx -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 00/16] f2fs: introduce flash-friendly file system
On Wednesday 10 October 2012 11:36:14 David Woodhouse wrote: > The whole thing is silly. What we actually want on an embedded system is > to ditch the FTL altogether and have direct access to the NAND. Then we > can know our file system is behaving optimally. And we don't need > hacks like TRIM to try to make things a little less broken. I think it's safe to say that the times for raw flash in consumer devices are over, whether we like it or not. Even if we could go back to MTD for internal storage, we'd still need something better than what we have for removable flash storage such as USB and SD. (and I know that xD cards are basically raw flash, but have you tried to buy one recently?) Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] TPM: Let the tpm char device be openable multiple times
On Wed, Oct 10, 2012 at 11:33:24AM -0500, Kent Yoder wrote: > On Sun, Sep 30, 2012 at 05:33:45PM -0600, Jason Gunthorpe wrote: > > How to use the TPM is really a user space policy choice, if the > > environment wants to use middleware then fine, but it is possible to > > make correct TPM apps without using middleware. > > I'm not sure how I feel about this. The single open rule doesn't > prevent replacement of the middleware, it just requires a > open()/close() I'm not interested in replacing the middleware, our designs do not use any middleware and several processes are required to access the TPM at once. Using open/close is an interesting idea, but it wouldn't work. open() is coded to return EBUSY if another process has it open, rather than block, and spinning on open would be unacceptable. > around any use of the device node. That seems simple enough to me. In > places where you do want TSS to be the sole opener, it can't enforce > that rule itself, so I think we need to preserve the option of a single > open at a minimum. I agree, but I'm not sure how to expose this function? I've seen other places abuse O_EXCL for this, but that would not be compatible with existing implementations. Three things come to mind - O_EXCL means the open only succeeds if it the only open and prevents others (not compatible) - Some other O_ flag is hijacked to mean the opposite of the above (yuk) - A sysfs flag is added to turn on the new O_EXCL behavior What do you think? Jason -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 00/16] f2fs: introduce flash-friendly file system
On Wednesday 10 October 2012 00:53:51 Theodore Ts'o wrote: > On Tue, Oct 09, 2012 at 01:01:24PM +0200, Lukáš Czerner wrote: > > Do not get me wrong, I do not think it is worth to wait for vendors > > to come to their senses, but it is worth constantly reminding that > > we *need* this kind of information and those heuristics are not > > feasible in the long run anyway. > > A number of us has been telling flash vendors exactly this. The > technical people do seem to understand. It's management who seem to > be primarily clueless, even though this information can be extracted > by employing timing attacks on the media. I've pointed this out > before, and the technical people agree that trying to keep this > information as a "trade secret" is pointless, stupid, and > counterproductive. Trying to get the pointy-haired bosses to > understand may take quite a while. For eMMC, I think we should start out defaulting to the characteristics that are reported by the device, because they are usually correct and those vendors for which that is not true can hopefully come to their senses when they see how f2fs performs by default. For USB media, the protocol does not allow you to specify the erase block size, so we have to guess. For SD cards, there is a field in the card's registers, but I've never seen any value in there other than 4 MB, and in most cases where that is not true, the standard does not allow encoding the correct amount: it only allows power-of-two numbers up to 4 MB, and typical numbers these days are 3 MB, 6 MB or 8 MB. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH] genirq: for edge interrupt IRQS_ONESHOT support with irq thread
On Fri, 12 Oct 2012, Liu, Chuansheng wrote: > > On SMP an interrupt which is raised after the ack() again before the > > handler finishes, can invoke another delivery on a different CPU, > > which then sees the IRQ_INPROGESS flag, masks it and flags it > > PENDING. When the primary handler on the first CPU returns, it sees > > the PENDING flag, unmasks and invokes the handler another time. > In this case, when IRQ_INPROGRESS flag is set, on another CPU, it will > mask and ack it, if before the primary handler on the first CPU returns, > the edge interrupt is raised again, it will be lost, right? > So I think set PENDING just confirm one time, it just depends on primary > handler > execution time and irq frequency. It does NOT matter. We marked it PENDING. And that guarantees that we invoke the handler again after unmasking. And that keeps stuff rolling. We would lose when we masked and did not notice that there was one, but we notice and store that information with the PENDING flag. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] gpio: add TS-5500 DIO headers support
On Mon, Oct 8, 2012 at 8:20 PM, Vivien Didelot
wrote:
> On Mon, 2012-10-08 at 12:38 +0200, Linus Walleij wrote:
>> On Wed, Sep 26, 2012 at 2:42 AM, Vivien Didelot
>> wrote:
>> Part of me dislike that you create one single driver for all
>> three blocks instead of abstracting the driver to handle one
>> block, and register one platform device each, 2-3 times.
>> But given that this is very tied to this one chip it could be the
>> simplest and most readable design so OK...
>
> I agree with you. I thought about that too and it will make it easier to
> support other similar platform DIO headers (such as the ones on the
> TS-5600). But I'm not sure about the implementation, I'm thinking about
> an array of struct ts5500_dio per block, described in a
> MODULE_DEVICE_TABLE. Something like:
>
> static struct platform_device_id ts5500_device_ids[] = {
> { "ts5500-dio1", (kernel_ulong_t) ts5500_dio1 },
> { "ts5500-dio2", (kernel_ulong_t) ts5500_dio2 },
> { "ts5500-lcd", (kernel_ulong_t) ts5500_lcd },
> { }
> };
> MODULE_DEVICE_TABLE(platform, ts5500_device_ids);
>
> What do you think?
It basically looks pretty nice, but can't tell until I see the entire
code...
>> > +static const char * const ts5500_pinout[38] = {
>> > + /* DIO1 Header (offset 0-13) */
>> > + [0] = "DIO1_0", /* pin 1 */
>> > + [1] = "DIO1_1", /* pin 3 */
>>
>> Pins pins pins. The pinctrl subsystem has a framework for keeping track of
>> pins and giving them names, which is another reason to convert this to a
>> pinctrl driver.
>>
>> Please consult Documentation/pinctrl.txt
>
> Sounds better then, thanks.
Well that may also be a pretty big step if you just want to mux
one bank of GPIO. I'm a bit ambivalent. But if you want to tie
pin and gpio information together and name all pins, pinctrl
is what should suit you best.
In the GPIO world, things are opaque "gpios" not really pins.
>> > +#ifndef NO_IRQ
>> > +#define NO_IRQ -1
>> > +#endif
>>
>> No. We have very solidly decided that NO_IRQ == 0.
>
> Ho ok, I didn't know that. Many implementations still use -1.
They are bad examples not to be followed.
http://lwn.net/Articles/470820/
>> > +/*
>> > + * This structure is used to describe capabilities of DIO lines,
>> > + * such as available directions, and mapped IRQ (if any).
>> > + */
>> > +struct ts5500_dio {
>> > + const unsigned long value_addr;
>> > + const int value_bit;
>> > + const unsigned long control_addr;
>> > + const int control_bit;
>>
>> All the above seem like they should be u8 rather than
>> const unsigned or const int.
>
> I used these types here to match {set,clear}_bit function prototypes.
> But I can use const u8 for sure.
Hm hm yes that is true. These functions only work on longs,
as they access the entire word from memory.
If you access these as u8, use direct operators rather than
set/clear_bit & friends.
No big deal really. Do it as it works best for you.
>> > + const int irq;
>>
>> IRQ numbers shall not be hard-coded into drivers like
>> this, they shall be passed in as resources from the outside
>> just like you pass in other platform data.
>
> Just curious, what's the point of doing this, as IRQ lines are wired?
It's a design pattern that only the platform knows about the IRQs
and they should be retrieved from there.
Resources tied to platform device is one way to get them, if they are
hardcoded.
Device Tree is another way on MIPS e.g.
And ACPI etc is used in some x86's I think.
Just that this kind of stuff which basically pertains to how the interrupt
controller is wired rather than this hardware block per se, means it
should be external.
>> > + const int direction;
>>
>> Use a bool out for this last thing?
>
> Or two bool in and out instead?
It if can be in and out at the same time, sure.
I'm probably just not getting it.
>> > +};
>> > +
>> > +static const struct ts5500_dio ts5500_dios[] = {
>> > + /* DIO1 Header (offset 0-13) */
>> > + [0] = { 0x7b, 0, 0x7a, 0, NO_IRQ, IN | OUT },
>>
>> Use C99 syntax and skip the [0] index (etc).
>
> I used this syntax because it is much more clearer to figure out what
> Linux offset corresponds to the physical DIO, but well...
OK you can keep the offset if you like no big deal.
>> static const struct ts5500_dio ts5500_dios[] = {
>> {
>> .value_addr = 0x7b,
>> .value_bit = 0,
>> .control_addr = 0x7a,
>> .control_bit = 0,
>> .direction = OUT,
>> },
>> {
>> .value_addr = 0x7b
>>
>>
>> Note absence of NO_IRQ - it's implicit zero in static
>> allocations.
>
> This will make the code longer, but this is more explicit.
> I should maybe group addr/bit pairs in a struct...
I really prefer if you do this because it makes the code way more
maintainable, because else, if you add a member to the struct
in the middle of the others, guess what happens.
>>
RE: [PATCH] genirq: for edge interrupt IRQS_ONESHOT support with irq thread
On Fri, 12 Oct 2012, Liu, Chuansheng wrote: > > -Original Message- > > From: anish kumar [mailto:anish198519851...@gmail.com] > > Sent: Friday, October 12, 2012 11:25 PM > > To: Liu, Chuansheng > > Cc: Thomas Gleixner; linux-kernel@vger.kernel.org > > Subject: RE: [PATCH] genirq: for edge interrupt IRQS_ONESHOT support with > > irq > > thread > > > > On Fri, 2012-10-12 at 14:57 +, Liu, Chuansheng wrote: > > > > On SMP an interrupt which is raised after the ack() again before the > > > > handler finishes, can invoke another delivery on a different CPU, > > > > which then sees the IRQ_INPROGESS flag, masks it and flags it > > > > PENDING. When the primary handler on the first CPU returns, it sees > > > > the PENDING flag, unmasks and invokes the handler another time. > > > In this case, when IRQ_INPROGRESS flag is set, on another CPU, it will > > > mask and ack it, if before the primary handler on the first CPU returns, > > > the edge interrupt is raised again, it will be lost, right? > > Why will the interrupt be raised again?Is not it masked?I read tglx > I means because it is masked, if at this time device issues edge irq, > It will not be delivered and lost. No, it is NOT lost. The irq is marked PENDING already, so we invoke the handler again and handle it. And before we invoke the handler another time we unmask it. It does not matter at all whether the interrupt has been sent five times while it was masked. What matters is that we recorded the first one and set the PENDING flag. That way we invoke the interrupt handler again and keep stuff rolling. Thanks, tglx -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: PROBLEM: [dm-crypt] read starvation during writeback
On 10/12/2012 09:37 PM, Michael Zugelder wrote: > I'm having an issue reading data via dm-crypt when there is heavy > writeback going on (i.e. copying large files or using dd). A single > read takes anywhere from a few seconds to multiple minutes. > > Testing setup: > * Fedora 17, stock 3.5.4-2.fc17 kernel and a self-compiled 3.6.1 kernel > * 320 GiB USB hard drive (sdb) I guess that USB is the key factor here... I remember to have similar problem some time ago even without dmcrypt. Is it reproducible with the same kernel cfg but with internal disk? You can also test completely fake underlying device, use device-mapper- zero target: dmsetup create dev_zero --table "0 zero" (All writes are dropped and all reads returns zero in this case.) Is there any starvation with this setup? (It shouldn't.) > * dmsetup library version 1.02.74 (2012-03-06), driver version 4.23.0 > * dm-crypt set up using cipher_null: >echo "0 $(blockdev --getsize /dev/sdb) crypt cipher_null - 0 /dev/sdb > 0"|dmsetup create test Btw you can use cryptsetup with cipher "null" to simplify (I added to cryptsetup to test exactly such scenarios). So, it means that encryption is not the problem. The crypto_null will cause that there is no crypto operation (it is just plain data copy) but the remaining dmcrypt overhead remains exactly the same. > * writeback induced by running 'dd if=/dev/zero of=$target bs=1M' Any change if you use oflag=direct ? (iow using direct io) > I experimented a bit with the other device mapper targets, namely linear > and stripe, but both worked completely fine. I also tried putting a > linear mapping above dm-crypt, with no impact on performance. Comparing > the content of the /sys/block/$DEV files of the linear mapping and > dm-crypt, there are no differences beside the name, dev no, stats, > uevent and inflight files. There is crucial difference between linear/stripe and dmcrypt: linear just remaps IO target device, dmcrypt queues operations (using kernel workqueue) and creates full bio clones. So comparison here is IMHO not much helpful. There are two internal dmcrypt queues, but I think that the problem is triggered by some combination with USB storage backend. > Any pointers would be appreciated, I haven't found much on the web about > this issue. Btw there was a proposed rewrite of internal dmcrypt queues, if you have time, you can try if it changes anything for your use case. Patches in dm-devel archive http://www.redhat.com/archives/dm-devel/2012-August/msg00210.html Milan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [RFT/PATCH] serial: omap: prevent resume if device is not suspended.
Russell King - ARM Linux writes: > On Fri, Oct 12, 2012 at 10:59:22AM -0700, Kevin Hilman wrote: >> Russell King - ARM Linux writes: >> >> > On Fri, Oct 12, 2012 at 09:35:54AM -0700, Kevin Hilman wrote: >> >> Sourav writes: >> >> > diff --git a/drivers/tty/serial/omap-serial.c >> >> > b/drivers/tty/serial/omap-serial.c >> >> > index 6ede6fd..3fbc7f7 100644 >> >> > --- a/drivers/tty/serial/omap-serial.c >> >> > +++ b/drivers/tty/serial/omap-serial.c >> >> > @@ -1414,6 +1414,7 @@ static int __devinit serial_omap_probe(struct >> >> > platform_device *pdev) >> >> > INIT_WORK(>qos_work, serial_omap_uart_qos_work); >> >> > >> >> > platform_set_drvdata(pdev, up); >> >> > + pm_runtime_set_active(>dev); >> >> >> >> NAK. >> >> >> >> This will obviously break platforms where the UARTs are not active >> >> before driver loads. >> > >> > I thought I had proposed a solution for this issue, which was this >> > sequence: >> > >> > omap_device_enable(dev); >> > >> > pm_runtime_set_active(dev); >> > >> > pm_runtime_enable(dev); >> > >> > >> > Yes, I can understand people not liking the omap_device_enable() >> > there, but I also notice that the email suggesting that never got a >> > reply either - not even a "I tried this and it doesn't work" or "it >> > does work". >> >> Yes, that solution would work (though I didn't actually try it.) >> >> However, we can't use omap_device_enable() in the driver. We're trying >> to clean all the drivers of OMAP-specific APIs. That being said, >> something similar could be done in the device/board init code to ensure >> the UART HW is in the state that the driver is expecting it, but again, >> that would just mask the real problem which is that a (re)init of the >> console UART on 2420/n800 is causing output to disappear. > > See my more expansive suggestion just posted. > > Whatever way, this discrepancy between runtime PM state and actual device > state is what is biting you, and it is that which needs fixing. I'm not conviced (yet) that a mismatch is the root cause. Yes, that's what the author of $SUBJECT patch assumed and stated, but I'm not pursuaded. If it's an improperly configured mux issue, then the UART will break whenever the device is actually omap_device_enable'd, whether in the driver or in the bus layer. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] tile updates for 3.7
Linus,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git master
Note that this is not based off the 3.6.0 release but off an intermediate
point that includes David Howell's uapi disintegration work; the bulk
of this change is the tile uapi disintegration. There is also a one-line
change in here to enable interrupts in do_work_pending() to avoid a
WARN_ON in _local_bh_enable_ip().
Chris Metcalf (2):
Merge tag 'tags/disintegrate-tile-20121009' into for-linus
arch/tile: enable interrupts in do_work_pending()
David Howells (2):
UAPI: (Scripted) Disintegrate arch/tile/include/arch
UAPI: (Scripted) Disintegrate arch/tile/include/asm
arch/tile/include/arch/Kbuild | 17
arch/tile/include/arch/spr_def.h | 12 +--
arch/tile/include/asm/Kbuild |3 -
arch/tile/include/asm/hardwall.h | 33 +---
arch/tile/include/asm/ptrace.h | 72 +---
arch/tile/include/asm/setup.h |7 +-
arch/tile/include/asm/signal.h | 12 +--
arch/tile/include/asm/unistd.h | 25 +-
arch/tile/include/uapi/arch/Kbuild | 17
arch/tile/include/{ => uapi}/arch/abi.h|0
arch/tile/include/{ => uapi}/arch/chip.h |0
arch/tile/include/{ => uapi}/arch/chip_tile64.h|0
arch/tile/include/{ => uapi}/arch/chip_tilegx.h|0
arch/tile/include/{ => uapi}/arch/chip_tilepro.h |0
arch/tile/include/{ => uapi}/arch/icache.h |0
arch/tile/include/{ => uapi}/arch/interrupts.h |0
arch/tile/include/{ => uapi}/arch/interrupts_32.h |0
arch/tile/include/{ => uapi}/arch/interrupts_64.h |0
arch/tile/include/{ => uapi}/arch/opcode.h |0
arch/tile/include/{ => uapi}/arch/opcode_tilegx.h |0
arch/tile/include/{ => uapi}/arch/opcode_tilepro.h |0
arch/tile/include/{ => uapi}/arch/sim.h|0
arch/tile/include/{ => uapi}/arch/sim_def.h|0
arch/tile/include/uapi/arch/spr_def.h | 26 ++
arch/tile/include/{ => uapi}/arch/spr_def_32.h |6 +-
arch/tile/include/{ => uapi}/arch/spr_def_64.h |6 +-
arch/tile/include/uapi/asm/Kbuild | 15
arch/tile/include/{ => uapi}/asm/auxvec.h |0
arch/tile/include/{ => uapi}/asm/bitsperlong.h |0
arch/tile/include/{ => uapi}/asm/byteorder.h |0
arch/tile/include/{ => uapi}/asm/cachectl.h|0
arch/tile/include/uapi/asm/hardwall.h | 51
arch/tile/include/{ => uapi}/asm/kvm_para.h|0
arch/tile/include/{ => uapi}/asm/mman.h|0
arch/tile/include/uapi/asm/ptrace.h| 88
arch/tile/include/uapi/asm/setup.h | 21 +
arch/tile/include/{ => uapi}/asm/sigcontext.h |0
arch/tile/include/{ => uapi}/asm/siginfo.h |0
arch/tile/include/uapi/asm/signal.h| 27 ++
arch/tile/include/{ => uapi}/asm/stat.h|0
arch/tile/include/{ => uapi}/asm/swab.h|0
arch/tile/include/uapi/asm/unistd.h| 34
arch/tile/kernel/process.c |3 +
43 files changed, 298 insertions(+), 177 deletions(-)
rename arch/tile/include/{ => uapi}/arch/abi.h (100%)
rename arch/tile/include/{ => uapi}/arch/chip.h (100%)
rename arch/tile/include/{ => uapi}/arch/chip_tile64.h (100%)
rename arch/tile/include/{ => uapi}/arch/chip_tilegx.h (100%)
rename arch/tile/include/{ => uapi}/arch/chip_tilepro.h (100%)
rename arch/tile/include/{ => uapi}/arch/icache.h (100%)
rename arch/tile/include/{ => uapi}/arch/interrupts.h (100%)
rename arch/tile/include/{ => uapi}/arch/interrupts_32.h (100%)
rename arch/tile/include/{ => uapi}/arch/interrupts_64.h (100%)
rename arch/tile/include/{ => uapi}/arch/opcode.h (100%)
rename arch/tile/include/{ => uapi}/arch/opcode_tilegx.h (100%)
rename arch/tile/include/{ => uapi}/arch/opcode_tilepro.h (100%)
rename arch/tile/include/{ => uapi}/arch/sim.h (100%)
rename arch/tile/include/{ => uapi}/arch/sim_def.h (100%)
create mode 100644 arch/tile/include/uapi/arch/spr_def.h
rename arch/tile/include/{ => uapi}/arch/spr_def_32.h (98%)
rename arch/tile/include/{ => uapi}/arch/spr_def_64.h (98%)
rename arch/tile/include/{ => uapi}/asm/auxvec.h (100%)
rename arch/tile/include/{ => uapi}/asm/bitsperlong.h (100%)
rename arch/tile/include/{ => uapi}/asm/byteorder.h (100%)
rename arch/tile/include/{ => uapi}/asm/cachectl.h (100%)
create mode 100644 arch/tile/include/uapi/asm/hardwall.h
rename arch/tile/include/{ => uapi}/asm/kvm_para.h (100%)
rename arch/tile/include/{ => uapi}/asm/mman.h (100%)
create mode 100644 arch/tile/include/uapi/asm/ptrace.h
Re: [PATCH v2] net: calxedaxgmac: rework transmit ring handling
Eric Dumazet wrote: >On Fri, 2012-10-12 at 13:04 -0500, Rob Herring wrote: >> From: Rob Herring >> >> Only generate tx interrupts on every ring size / 4 descriptors. Move >the >> netif_stop_queue call to the end of the xmit function rather than >> checking at the beginning. >> >> Signed-off-by: Rob Herring >> --- >> v2: >> - Add missed enabling of the descriptor tx interrupt > >Seems to be net-next material to me. > Perhaps, but the series as a whole is what I've been testing. This one has the least performance impact. >Furthermore, your changelog is a bit terse for such a patch, that could >easily break upper layers. > >You need to tell us how long TX completion for a packet might be >deferred. The prior behavior was only interrupting when done with all buffers. It now will interrupt before completely emptying the ring. Rob -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] TPM: Provide a tpm_tis OF driver
On Wed, Oct 10, 2012 at 11:24:28AM -0500, Kent Yoder wrote:
> Why change the structs to const here? This generates warnings for me:
I should have dropped this, I was added when I added the __devinitdata
annotations..
> > +
> > +static struct platform_driver tis_driver = {
> > .driver = {
> > .name = "tpm_tis",
> > .owner = THIS_MODULE,
> > .pm = _tis_pm,
> > + .of_match_table = of_match_ptr(tis_of_platform_match),
> > },
>
> Patch v2 removes the ifdef around of_match_table, which now generates
> an error:
Yes, this update was following the style of other drivers. Obviously I
never thought to try this on x86 (only PPC), so I will try to setup a
compile for that as well and send v3.
I suspect this is simply a missing #include.
Regards,
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/5] efivarfs: efivarfs_create() ensure we drop our reference on inode on error
On Fri, 2012-10-12 at 20:21 +0100, Matt Fleming wrote: > This is a common idiom used throughout the kernel to simply error paths. > As you noted, calling kfree(NULL) is harmless and there's certainly no > need to worry about the overhead of calling kfree() without doing any > freeing since the error path is also the slow path. A "return -ENOMEM" looks simpler and easier to read to me, but that is a subjective opinion :) -- Khalid -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
atd stopped working in kernel 3.6.0
I apologize if this is the wrong spot. I can't figure out where to go.
atd fails beginning in kernel 3.6.0 reporting 'Can't link execution
file: Operation not permitted'
1) atd works in kernel 3.5.5
2) A version built from the latest source in 3.6.1 fails in the same way
Find the strace log below. I don't understand it.
The reported error seems to happen at:
link("a101574742", "=101574742") = -1 EPERM (Operation not
permitted)
In 3.5.5, when atd works, the end of the trace changes at the first getdents;
the link never happens:
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) =
0xb779c000 _llseek(3, 0, [0], SEEK_CUR)= 0
write(3, "1119\n", 5) = 5
fcntl64(3, F_SETFD, FD_CLOEXEC) = 0
setregid32(0, 2)= 0
setreuid32(0, 2)= 0
time(NULL) = 1349882275
stat64(".", {st_dev=makedev(8, 4), st_ino=10715414, st_mode=S_IFDIR|0700,
st_nlink=2, st_uid=2, st_gid=2, st_blksize=4096, st_blocks=8, st_size=4096,
st_atime=2012/10/10-09:17:07, st_mtime=2012/10/10-09:17:06,
st_ctime=2012/10/10-09:17:06}) = 0
openat(AT_FDCWD, ".", O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|O_CLOEXEC) = 4
getdents(4, {{d_ino=10715416, d_off=618125610, d_reclen=16, d_name=".SEQ"}
{d_ino=10715414, d_off=901055122, d_reclen=16, d_name="."} {d_ino=10715172,
d_off=2147483647, d_reclen=16, d_name=".."}}, 32768) = 48
getdents(4, {}, 32768) = 0
close(4)= 0
rt_sigprocmask(SIG_BLOCK, [CHLD], [], 8) = 0
rt_sigaction(SIGCHLD, NULL, {0x80492b0, [], SA_NOCLDSTOP}, 8) = 0
rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
nanosleep({3600, 0},
atd log in 3.6.1:
execve("/usr/sbin/atd", ["/usr/sbin/atd", "-d"],
["CPLUS_INCLUDE_PATH=/usr/lib/qt/i"..., "NNTPSERVER=127.0.0.1",
"MANPATH=/usr/local/man:/usr/man:"..., "HZ=100", "HOSTNAME=randytool.net",
"unknownbluetooth=00:1C:62:D1:5C:"..., "SHELL=/bin/bash", "TERM=linux",
"HUSHLOGIN=FALSE", "jen=00:19:E3:EB:D2:04", "USER=root",
"LS_COLORS=no=00:fi=00:di=01;34:l"..., "GDK_USE_XFT=1",
"T1LIB_CONFIG=/usr/share/t1lib/t1"..., "MINICOM=-c on",
"MAIL=/var/spool/mail/root", "PATH=/bin:/sbin:/usr/bin:/usr/sb"...,
"LC_COLLATE=C", "INPUTRC=/etc/inputrc", "PWD=/var/log", "LANG=en_US",
"QT4DIR=/usr/lib/qt", "headset=00:13:17:DD:D0:86",
"bluetooth=00:11:67:6B:77:2D", "TZ=MST7MDT", "PS1=`pwd`# ", "PS2=> ",
"LESSCHARSET=iso8859", "SHLVL=1", "HOME=/root", "LS_OPTIONS=-F -b -T 0
--color=au"..., "LESS=-M -i", "LOGNAME=root", "VISUAL=/usr/bin/emacs",
"LESSOPEN=|lesspipe.sh %s", "PKG_CONFIG_PATH=/usr/lib/pkgconf"...,
"G_BROKEN_FILENAMES=1", "_=/usr/bin/strace", "OLDPWD=/root"]) = 0
brk(0) = 0x8afb000
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) =
0xb76ef000
access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory)
open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3
fstat64(3, {st_dev=makedev(8, 4), st_ino=5948477, st_mode=S_IFREG|0644,
st_nlink=1, st_uid=0, st_gid=0, st_blksize=4096, st_blocks=184, st_size=90810,
st_atime=2012/10/09-17:00:59, st_mtime=2012/10/09-17:00:59,
st_ctime=2012/10/09-17:00:59}) = 0
mmap2(NULL, 90810, PROT_READ, MAP_PRIVATE, 3, 0) = 0xb76d8000
close(3)= 0
open("/lib/libc.so.6", O_RDONLY|O_CLOEXEC) = 3
read(3,
"\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0\0\227\1\0004\0\0\0"..., 512) =
512
fstat64(3, {st_dev=makedev(8, 4), st_ino=3809925, st_mode=S_IFREG|0755,
st_nlink=1, st_uid=0, st_gid=0, st_blksize=4096, st_blocks=3504,
st_size=1790836, st_atime=2012/10/08-22:47:01, st_mtime=2012/09/17-14:35:31,
st_ctime=2012/09/20-19:11:52}) = 0
mmap2(NULL, 1591836, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) =
0xb7553000
mprotect(0xb76d1000, 4096, PROT_NONE) = 0
mmap2(0xb76d2000, 12288, PROT_READ|PROT_WRITE,
MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x17e) = 0xb76d2000
mmap2(0xb76d5000, 10780, PROT_READ|PROT_WRITE,
MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0xb76d5000
close(3)= 0
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) =
0xb7552000
set_thread_area({entry_number:-1 -> 6, base_addr:0xb75526c0, limit:1048575,
seg_32bit:1, contents:0, read_exec_only:0, limit_in_pages:1, seg_not_present:0,
useable:1}) = 0
mprotect(0xb76d2000, 8192, PROT_READ) = 0
mprotect(0xb7712000, 4096, PROT_READ) = 0
munmap(0xb76d8000, 90810) = 0
brk(0) = 0x8afb000
brk(0x8b1c000) = 0x8b1c000
socket(PF_FILE, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0) = 3
connect(3, {sa_family=AF_FILE, path="/var/run/nscd/socket"}, 110) = -1 ENOENT
(No such file or directory)
close(3)= 0
socket(PF_FILE, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0) = 3
connect(3, {sa_family=AF_FILE, path="/var/run/nscd/socket"}, 110) = -1
[PATCH 1/3] Drivers: hv: Get rid of unnecessary forward declarations
Get rid of unnecessary forward declarations. Signed-off-by: K. Y. Srinivasan Reviewed-by: Haiyang Zhang Reported-by: Jason Wang --- drivers/hv/channel.c |8 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index 4065374..1bb1a80 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -33,14 +33,6 @@ #define NUM_PAGES_SPANNED(addr, len) \ ((PAGE_ALIGN(addr + len) >> PAGE_SHIFT) - (addr >> PAGE_SHIFT)) -/* Internal routines */ -static int create_gpadl_header( - void *kbuffer, /* must be phys and virt contiguous */ - u32 size, /* page-size multiple */ - struct vmbus_channel_msginfo **msginfo, - u32 *messagecount); -static void vmbus_setevent(struct vmbus_channel *channel); - /* * vmbus_setevent- Trigger an event notification on the specified * channel. -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/3] Drivers: hv: Get rid of hv_ringbuffer_cleanup()
hv_ringbuffer_cleanup() is an empty function; get rid of it.
Signed-off-by: K. Y. Srinivasan
Reviewed-by: Haiyang Zhang
Reported-by: Jason Wang
---
drivers/hv/channel.c |4
drivers/hv/hyperv_vmbus.h |1 -
drivers/hv/ring_buffer.c | 11 ---
3 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 773a2f2..2edb440 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -529,10 +529,6 @@ void vmbus_close(struct vmbus_channel *channel)
vmbus_teardown_gpadl(channel,
channel->ringbuffer_gpadlhandle);
- /* Cleanup the ring buffers for this channel */
- hv_ringbuffer_cleanup(>outbound);
- hv_ringbuffer_cleanup(>inbound);
-
free_pages((unsigned long)channel->ringbuffer_pages,
get_order(channel->ringbuffer_pagecount * PAGE_SIZE));
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index d8d1fad..d46f88e 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -551,7 +551,6 @@ extern void hv_synic_cleanup(void *arg);
int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer,
u32 buflen);
-void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);
int hv_ringbuffer_write(struct hv_ring_buffer_info *ring_info,
struct scatterlist *sglist,
diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c
index 7233c88..25caf42 100644
--- a/drivers/hv/ring_buffer.c
+++ b/drivers/hv/ring_buffer.c
@@ -281,17 +281,6 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info
*ring_info,
/*
*
- * hv_ringbuffer_cleanup()
- *
- * Cleanup the ring buffer
- *
- */
-void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info)
-{
-}
-
-/*
- *
* hv_ringbuffer_write()
*
* Write to the ring buffer
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
