From cd5a92d1b93598823395ec63fcc4cb07f41cf7d5 Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <linux@treblig.org>
Date: Sun, 31 Oct 2010 07:26:03 +0000
Subject: [PATCH] --- yaml --- r: 221612 b: refs/heads/master c:
 6f9b901823aafd14a84ae27f61ff28bafed01260 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/l2tp/l2tp_debugfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 16897caef63d..c97f27282483 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eae61ae15b752b919ea45746f6dff449ff6d3281
+refs/heads/master: 6f9b901823aafd14a84ae27f61ff28bafed01260
diff --git a/trunk/net/l2tp/l2tp_debugfs.c b/trunk/net/l2tp/l2tp_debugfs.c
index 104ec3b283d4..b8dbae82fab8 100644
--- a/trunk/net/l2tp/l2tp_debugfs.c
+++ b/trunk/net/l2tp/l2tp_debugfs.c
@@ -249,7 +249,7 @@ static int l2tp_dfs_seq_open(struct inode *inode, struct file *file)
 	struct seq_file *seq;
 	int rc = -ENOMEM;
 
-	pd = kzalloc(GFP_KERNEL, sizeof(*pd));
+	pd = kzalloc(sizeof(*pd), GFP_KERNEL);
 	if (pd == NULL)
 		goto out;