fix up aarch64 build... mis-merge in kernel-arm64.patch

This commit is contained in:
Kyle McMartin 2015-02-27 12:46:20 -05:00
parent 57d8c91cf8
commit 1fdb9a6d66
2 changed files with 6 additions and 3 deletions

View File

@ -4515,7 +4515,7 @@ index 2437196..914287d 100644
while (true)
cpu_relax();
}
+ dump_stack_set_arch_desc("%s (DT)", machine_name);
+ dump_stack_set_arch_desc("%s (DT)", of_flat_dt_get_machine_name());
}
/*

View File

@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
%global baserelease 200
%global baserelease 201
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -2281,7 +2281,10 @@ fi
# ||----w |
# || ||
%changelog
* Fri Feb 27 2015 Josh Boyer <jwboyer@fedoraproject.org - 3.18.8-200
* Fri Feb 27 2015 Kyle McMartin <kyle@fedoraproject.org> - 3.18.8-201
- Fix up aarch64 build... mis-merge in kernel-arm64.patch.
* Fri Feb 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.8-200
- Linux v3.18.8
* Thu Feb 26 2015 Josh Boyer <jwboyer@fedoraproject.org>