[FIX] warnings in swap_buffer

build it with -Werror

Change-Id: Ieb593446051324ae5e389d127342fe73e0bc87d7
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>

diff --git a/buffer/buffer_queue.c b/buffer/buffer_queue.c
index db82a2c..28f7640 100644 (file)
--- a/buffer/buffer_queue.c
+++ b/buffer/buffer_queue.c
@@ -150,8 +150,6 @@ int buffer_queue_allocation(size_t subbuffer_size,
        }
        allocated_buffers++;
 
-       print_msg(" Buffer allocated = 0x%p\n", write_queue.end_ptr->data_buffer);
-
        sync_init(&write_queue.end_ptr->buffer_sync);
 
        /* Buffer initialization */
@@ -180,10 +178,6 @@ int buffer_queue_allocation(size_t subbuffer_size,
                }
                allocated_buffers++;
 
-               print_msg(" Buffer allocated = 0x%p, pages_order = %d\n",
-                         write_queue.end_ptr->data_buffer,
-                         pages_order_in_subbuffer);
-
                sync_init(&write_queue.end_ptr->buffer_sync);
 
                /* Buffer initialization */
@@ -274,8 +268,6 @@ void buffer_queue_free(void)
                tmp = read_queue.start_ptr;
                read_queue.start_ptr = read_queue.start_ptr->next_in_queue;
                buffer_free(tmp->data_buffer, queue_subbuffer_size);
-               print_msg(" Buffer free = 0x%x\n", (unsigned long)
-                          tmp->data_buffer);
                memory_free(tmp);
        }
 
@@ -284,8 +276,6 @@ void buffer_queue_free(void)
                tmp = write_queue.start_ptr;
                write_queue.start_ptr = write_queue.start_ptr->next_in_queue;
                buffer_free(tmp->data_buffer, queue_subbuffer_size);
-               print_msg(" Buffer free = 0x%x\n", (unsigned long)
-                                                                                  tmp->data_buffer);
                memory_free(tmp);
        }
 

diff --git a/buffer/swap_buffer_module.c b/buffer/swap_buffer_module.c
index ec474e0..c0da9f5 100644 (file)
--- a/buffer/swap_buffer_module.c
+++ b/buffer/swap_buffer_module.c
@@ -80,7 +80,8 @@ int swap_buffer_init(size_t subbuffer_size, unsigned int nr_subbuffers,
        if ((swap_buffer_status & BUFFER_ALLOC) &&
                (subbuffers_size == subbuffer_size) &&
                (subbuffers_num == nr_subbuffers) &&
-               (subbuffer_full_callback == subbuffer_callback)) {
+               ((subbuffer_callback_type)subbuffer_full_callback ==
+                subbuffer_callback)) {
                result = buffer_queue_reset();
                goto swap_buffer_init_work;
        }

diff --git a/build.sh b/build.sh
index 4a5c400..b2f049e 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -44,7 +44,8 @@ ln -s asm-${link_name} ${uprobe_arch_dir}/asm
 
 buffer_module_name=swap_buffer.ko
 buffer_inc=${modules_inc}
-make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${buffer_dir} modules || exit 1
+make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${buffer_dir} \
+       extra_cflags="-Werror -I${modules_dir}" modules || exit 1
 
 driver_module_name=swap_driver.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${driver_dir} \