Skip to content

fix kernel building with gcc newer than 4.6 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gitaen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix kernel building with gcc newer than 4.6 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux-3.4/arch/arm/mach-sunxi/power/brom/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ targets := resumes.elf

#use "-Os" flags.
#Don't use "-O2" flags.
KBUILD_CFLAGS := -g -c -nostdlib -march=armv7-a -marm -fno-unwind-tables -fno-asynchronous-unwind-tables -mlittle-endian -O2 --min_array_alignment=4 --no_unaligned_access
KBUILD_CFLAGS := -g -c -nostdlib -march=armv7-a -marm -fno-unwind-tables -fno-asynchronous-unwind-tables -mlittle-endian -O2 -mno-unaligned-access

#Include the cur dir.
KBUILD_CPPFLAGS += -I.
Expand Down
12 changes: 6 additions & 6 deletions linux-3.4/arch/arm/mach-sunxi/power/brom/resumes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ typedef unsigned int __u32;
typedef struct _Resume_file_head
{
__u32 jump_instruction; // one intruction jumping to real code
__u8 magic[8]; // ="eGON.BT0" or "eGON.BT1", not C-style string.
__u8 magic[8] __attribute__ ((aligned (4))); // ="eGON.BT0" or "eGON.BT1", not C-style string.
__u32 check_sum; // generated by PC
__u32 length; // generated by PC
__u32 pub_head_size; // the size of resume_file_head_t
__u8 pub_head_vsn[4]; // the version of resume_file_head_t
__u8 file_head_vsn[4]; // the version of resume0_file_head_t or resume1_file_head_t
__u8 Resume_vsn[4]; // Resume version
__u8 eGON_vsn[4]; // eGON version
__u8 platform[8]; // platform information
__u8 pub_head_vsn[4] __attribute__ ((aligned (4))); // the version of resume_file_head_t
__u8 file_head_vsn[4] __attribute__ ((aligned (4))); // the version of resume0_file_head_t or resume1_file_head_t
__u8 Resume_vsn[4] __attribute__ ((aligned (4))); // Resume version
__u8 eGON_vsn[4] __attribute__ ((aligned (4))); // eGON version
__u8 platform[8] __attribute__ ((aligned (4))); // platform information
}resume_file_head_t;

extern const resume_file_head_t resume_head;
Expand Down
2 changes: 1 addition & 1 deletion linux-3.4/drivers/gpu/ion/ion_cma_heap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct ion_cma_buffer_info {
struct page *dma_alloc_from_contiguous(struct device *dev,
int count, unsigned int align);
void __dma_clear_buffer(struct page *page, size_t size);
inline pgprot_t __get_dma_pgprot(struct dma_attrs *attrs, pgprot_t prot);
pgprot_t __get_dma_pgprot(struct dma_attrs *attrs, pgprot_t prot);
void *__dma_alloc_remap(struct page *page, size_t size, gfp_t gfp,
pgprot_t prot, const void *caller);
void __dma_remap(struct page *page, size_t size, pgprot_t prot);
Expand Down