diff options
| author | David S. Miller | 2013-02-19 05:32:49 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-02-19 05:34:21 +0100 |
| commit | 6338a53a2bd02d5878ab449371323364b7cc7694 (patch) | |
| tree | 461c4acae130771b9856715bc2cfdc341b6e5964 /arch/tile/kernel/reboot.c | |
| parent | ipv6: fix a sparse warning (diff) | |
| parent | xfrm: release neighbor upon dst destruction (diff) | |
| download | kernel-qcow2-linux-6338a53a2bd02d5878ab449371323364b7cc7694.tar.gz kernel-qcow2-linux-6338a53a2bd02d5878ab449371323364b7cc7694.tar.xz kernel-qcow2-linux-6338a53a2bd02d5878ab449371323364b7cc7694.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net
Pull in 'net' to take in the bug fixes that didn't make it into
3.8-final.
Also, deal with the semantic conflict of the change made to
net/ipv6/xfrm6_policy.c A missing rt6->n neighbour release
was added to 'net', but in 'net-next' we no longer cache the
neighbour entries in the ipv6 routes so that change is not
appropriate there.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/tile/kernel/reboot.c')
| -rw-r--r-- | arch/tile/kernel/reboot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/tile/kernel/reboot.c b/arch/tile/kernel/reboot.c index baa3d905fee2..d1b5c913ae72 100644 --- a/arch/tile/kernel/reboot.c +++ b/arch/tile/kernel/reboot.c @@ -16,6 +16,7 @@ #include <linux/reboot.h> #include <linux/smp.h> #include <linux/pm.h> +#include <linux/export.h> #include <asm/page.h> #include <asm/setup.h> #include <hv/hypervisor.h> @@ -49,3 +50,4 @@ void machine_restart(char *cmd) /* No interesting distinction to be made here. */ void (*pm_power_off)(void) = NULL; +EXPORT_SYMBOL(pm_power_off); |